From 47d8325b76aade32aea9a5871d4c5b7260bba5f1 Mon Sep 17 00:00:00 2001 From: Sophia <16596228+sophiaaar@users.noreply.github.com> Date: Wed, 1 Sep 2021 11:13:52 +0200 Subject: [PATCH 001/149] [2022.1] Branch off: Remove references to 2021.2 (#5483) * remove references to 2021.2 * fixes from pr review * Update urp_upgrade.yml --- .yamato/_abv.yml | 153 +-------- .yamato/_editor_pinning.yml | 4 +- .yamato/_editor_priming.yml | 139 -------- .../_latest_editor_versions_2021.2.metafile | 5 - .yamato/_projectcontext.yml | 58 ---- .yamato/_templates.yml | 308 ----------------- .yamato/all-hdrp.yml | 83 ----- .yamato/all-hdrp_dxr.yml | 33 -- .yamato/all-hdrp_hybrid.yml | 33 -- .yamato/all-hdrp_performancetests.yml | 14 - .yamato/all-postprocessing.yml | 51 --- .yamato/all-shadergraph.yml | 69 ---- .../all-shadergraph_builtin_foundation.yml | 37 -- .yamato/all-shadergraph_builtin_lighting.yml | 37 -- .yamato/all-shadergraph_stereo.yml | 33 -- .yamato/all-smoke_test.yml | 35 -- .yamato/all-universal_hybrid.yml | 33 -- .yamato/all-universal_split.yml | 37 -- .yamato/all-universal_stereo.yml | 33 -- .yamato/all-urp.yml | 63 ---- .yamato/all-urp_2d.yml | 65 ---- .yamato/all-urp_foundation.yml | 69 ---- .yamato/all-urp_lighting.yml | 69 ---- .yamato/all-urp_perf.yml | 17 - .yamato/all-urp_performance_boatattack.yml | 49 --- .yamato/all-urp_performance_lostcrypt.yml | 39 --- .yamato/all-urp_postpro.yml | 69 ---- .yamato/all-urp_terrain.yml | 69 ---- .yamato/all-urpupdate.yml | 39 --- .yamato/all-urpupdate_boatattack.yml | 39 --- .yamato/all-urpupdate_top_asset_store.yml | 39 --- .yamato/all-vfx.yml | 49 --- .yamato/all-vfx_hdrp.yml | 49 --- .yamato/all-vfx_urp.yml | 43 --- .yamato/all-vikingvillage_builtin.yml | 31 -- .yamato/all-vikingvillage_urp.yml | 31 -- .yamato/config/__shared.metafile | 10 - .yamato/config/abv.metafile | 15 - .yamato/hdrp-linux-vulkan.yml | 275 --------------- .yamato/hdrp-osx-metal.yml | 83 ----- .yamato/hdrp-win-dx11.yml | 281 ---------------- .yamato/hdrp-win-dx12.yml | 281 ---------------- .yamato/hdrp-win-vulkan.yml | 281 ---------------- .yamato/hdrp_dxr-win-dx12.yml | 142 -------- .yamato/hdrp_hybrid-linux-openglcore.yml | 36 -- .yamato/hdrp_hybrid-linux-vulkan.yml | 103 ------ .yamato/hdrp_hybrid-osx-metal.yml | 124 ------- .yamato/hdrp_hybrid-win-dx11.yml | 141 -------- .yamato/hdrp_hybrid-win-dx12.yml | 141 -------- .yamato/hdrp_hybrid-win-vulkan.yml | 141 -------- .yamato/hdrp_performancetests-win-dx11.yml | 65 ---- .yamato/postprocessing-linux-vulkan.yml | 138 -------- .yamato/postprocessing-osx-metal.yml | 83 ----- .yamato/postprocessing-win-dx11.yml | 140 -------- .yamato/postprocessing-win-dx12.yml | 140 -------- .yamato/postprocessing-win-vulkan.yml | 140 -------- .yamato/shadergraph-android-opengles3.yml | 81 ----- .yamato/shadergraph-android-vulkan.yml | 81 ----- .yamato/shadergraph-iphone-metal.yml | 72 ---- .yamato/shadergraph-linux-openglcore.yml | 71 ---- .yamato/shadergraph-linux-vulkan.yml | 138 -------- .yamato/shadergraph-osx-metal.yml | 83 ----- .yamato/shadergraph-osx-openglcore.yml | 67 ---- .yamato/shadergraph-win-dx11.yml | 139 -------- .yamato/shadergraph-win-vulkan.yml | 139 -------- ...ph_builtin_foundation-linux-openglcore.yml | 36 -- ...rgraph_builtin_foundation-linux-vulkan.yml | 36 -- ...adergraph_builtin_foundation-osx-metal.yml | 42 --- ...raph_builtin_foundation-osx-openglcore.yml | 34 -- ...hadergraph_builtin_foundation-win-dx11.yml | 36 -- ...dergraph_builtin_foundation-win-vulkan.yml | 36 -- ...raph_builtin_lighting-linux-openglcore.yml | 36 -- ...dergraph_builtin_lighting-linux-vulkan.yml | 36 -- ...shadergraph_builtin_lighting-osx-metal.yml | 42 --- ...rgraph_builtin_lighting-osx-openglcore.yml | 34 -- .../shadergraph_builtin_lighting-win-dx11.yml | 36 -- ...hadergraph_builtin_lighting-win-vulkan.yml | 36 -- .yamato/shadergraph_stereo-win.yml | 101 ------ .yamato/smoke_test-win-dx11.yml | 139 -------- .../universal_hybrid-android-opengles3.yml | 81 ----- .yamato/universal_hybrid-android-vulkan.yml | 81 ----- .yamato/universal_hybrid-linux-openglcore.yml | 36 -- .yamato/universal_hybrid-linux-vulkan.yml | 103 ------ .yamato/universal_hybrid-osx-metal.yml | 83 ----- .yamato/universal_hybrid-win-dx11.yml | 104 ------ .yamato/universal_hybrid-win-vulkan.yml | 104 ------ .yamato/universal_stereo-win.yml | 101 ------ .yamato/urp_2d-android-opengles3.yml | 81 ----- .yamato/urp_2d-android-vulkan.yml | 81 ----- .yamato/urp_2d-iphone-metal.yml | 72 ---- .yamato/urp_2d-linux-openglcore.yml | 71 ---- .yamato/urp_2d-linux-vulkan.yml | 138 -------- .yamato/urp_2d-osx-metal.yml | 124 ------- .yamato/urp_2d-osx-openglcore.yml | 67 ---- .yamato/urp_2d-win-dx11.yml | 179 ---------- .yamato/urp_2d-win-dx12.yml | 179 ---------- .yamato/urp_2d-win-vulkan.yml | 179 ---------- .yamato/urp_foundation-android-opengles3.yml | 161 --------- .yamato/urp_foundation-android-vulkan.yml | 161 --------- .yamato/urp_foundation-iphone-metal.yml | 72 ---- .yamato/urp_foundation-linux-openglcore.yml | 71 ---- .yamato/urp_foundation-linux-vulkan.yml | 138 -------- .yamato/urp_foundation-osx-metal.yml | 83 ----- .yamato/urp_foundation-osx-openglcore.yml | 67 ---- .yamato/urp_foundation-win-dx11.yml | 252 -------------- .yamato/urp_foundation-win-dx12.yml | 252 -------------- .yamato/urp_foundation-win-vulkan.yml | 252 -------------- .yamato/urp_lighting-android-opengles3.yml | 161 --------- .yamato/urp_lighting-android-vulkan.yml | 161 --------- .yamato/urp_lighting-iphone-metal.yml | 72 ---- .yamato/urp_lighting-linux-openglcore.yml | 71 ---- .yamato/urp_lighting-linux-vulkan.yml | 138 -------- .yamato/urp_lighting-osx-metal.yml | 83 ----- .yamato/urp_lighting-osx-openglcore.yml | 67 ---- .yamato/urp_lighting-win-dx11.yml | 253 -------------- .yamato/urp_lighting-win-dx12.yml | 253 -------------- .yamato/urp_lighting-win-vulkan.yml | 253 -------------- ...rformance_boatattack-android-opengles3.yml | 195 ----------- ..._performance_boatattack-android-vulkan.yml | 195 ----------- ...rp_performance_boatattack-iphone-metal.yml | 167 ---------- ...rp_performance_boatattack-linux-vulkan.yml | 230 ------------- .../urp_performance_boatattack-osx-metal.yml | 223 ------------- .../urp_performance_boatattack-win-dx11.yml | 265 --------------- .../urp_performance_boatattack-win-dx12.yml | 265 --------------- .../urp_performance_boatattack-win-vulkan.yml | 193 ----------- ...rformance_boatattack-xrquest-opengles3.yml | 225 ------------- ..._performance_boatattack-xrquest-vulkan.yml | 225 ------------- ...erformance_lostcrypt-android-opengles3.yml | 195 ----------- ...p_performance_lostcrypt-android-vulkan.yml | 195 ----------- ...urp_performance_lostcrypt-iphone-metal.yml | 167 ---------- ...urp_performance_lostcrypt-linux-vulkan.yml | 230 ------------- .../urp_performance_lostcrypt-osx-metal.yml | 223 ------------- .../urp_performance_lostcrypt-win-dx11.yml | 265 --------------- .../urp_performance_lostcrypt-win-dx12.yml | 265 --------------- .../urp_performance_lostcrypt-win-vulkan.yml | 193 ----------- .yamato/urp_postpro-android-opengles3.yml | 161 --------- .yamato/urp_postpro-android-vulkan.yml | 161 --------- .yamato/urp_postpro-iphone-metal.yml | 72 ---- .yamato/urp_postpro-linux-openglcore.yml | 71 ---- .yamato/urp_postpro-linux-vulkan.yml | 138 -------- .yamato/urp_postpro-osx-metal.yml | 83 ----- .yamato/urp_postpro-osx-openglcore.yml | 67 ---- .yamato/urp_postpro-win-dx11.yml | 252 -------------- .yamato/urp_postpro-win-dx12.yml | 252 -------------- .yamato/urp_postpro-win-vulkan.yml | 252 -------------- .yamato/urp_terrain-android-opengles3.yml | 161 --------- .yamato/urp_terrain-android-vulkan.yml | 161 --------- .yamato/urp_terrain-iphone-metal.yml | 72 ---- .yamato/urp_terrain-linux-openglcore.yml | 71 ---- .yamato/urp_terrain-linux-vulkan.yml | 138 -------- .yamato/urp_terrain-osx-metal.yml | 83 ----- .yamato/urp_terrain-osx-openglcore.yml | 67 ---- .yamato/urp_terrain-win-dx11.yml | 252 -------------- .yamato/urp_terrain-win-dx12.yml | 252 -------------- .yamato/urp_terrain-win-vulkan.yml | 252 -------------- .yamato/urp_upgrade.yml | 1 - .yamato/urpupdate-win-dx11.yml | 85 ----- .yamato/urpupdate-win-vulkan.yml | 85 ----- .yamato/urpupdate_boatattack-win-dx11.yml | 85 ----- .yamato/urpupdate_boatattack-win-vulkan.yml | 85 ----- .../urpupdate_top_asset_store-win-dx11.yml | 85 ----- .../urpupdate_top_asset_store-win-vulkan.yml | 85 ----- .yamato/vfx_hdrp-linux-vulkan.yml | 275 --------------- .yamato/vfx_hdrp-osx-metal.yml | 247 -------------- .yamato/vfx_hdrp-win-dx11.yml | 315 ------------------ .yamato/vfx_hdrp-win-dx12.yml | 315 ------------------ .yamato/vfx_hdrp-win-vulkan.yml | 315 ------------------ .yamato/vfx_urp-iphone-metal.yml | 215 ------------ .yamato/vfx_urp-linux-openglcore.yml | 208 ------------ .yamato/vfx_urp-linux-vulkan.yml | 275 --------------- .yamato/vfx_urp-osx-metal.yml | 247 -------------- .yamato/vfx_urp-osx-openglcore.yml | 199 ----------- .yamato/vfx_urp-win-dx11.yml | 276 --------------- .yamato/vfx_urp-win-vulkan.yml | 276 --------------- ...ikingvillage_builtin-android-opengles3.yml | 170 ---------- .../vikingvillage_builtin-android-vulkan.yml | 170 ---------- .../vikingvillage_builtin-iphone-metal.yml | 154 --------- .../vikingvillage_builtin-linux-vulkan.yml | 218 ------------ .yamato/vikingvillage_builtin-osx-metal.yml | 193 ----------- .yamato/vikingvillage_builtin-win-dx11.yml | 211 ------------ .yamato/vikingvillage_builtin-win-dx12.yml | 211 ------------ .yamato/vikingvillage_builtin-win-vulkan.yml | 153 --------- .../vikingvillage_urp-android-opengles3.yml | 170 ---------- .yamato/vikingvillage_urp-android-vulkan.yml | 170 ---------- .yamato/vikingvillage_urp-iphone-metal.yml | 154 --------- .yamato/vikingvillage_urp-linux-vulkan.yml | 218 ------------ .yamato/vikingvillage_urp-osx-metal.yml | 193 ----------- .yamato/vikingvillage_urp-win-dx11.yml | 211 ------------ .yamato/vikingvillage_urp-win-dx12.yml | 211 ------------ .yamato/vikingvillage_urp-win-vulkan.yml | 153 --------- 190 files changed, 2 insertions(+), 24786 deletions(-) delete mode 100644 .yamato/_latest_editor_versions_2021.2.metafile diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index a54e995f2bc..265da5780e7 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -29,24 +28,6 @@ all_project_ci_trunk: rerun: on_new_revision all_project_ci_nightly_trunk: name: Nightly on trunk - variables: - CUSTOM_REVISION: '{{trunk.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_trunk - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_trunk - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_trunk - rerun: on_new_revision -all_project_ci_trunk_weekly_trunk: - name: Trunk Weekly on trunk variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' UTR_VERSION: "current" @@ -55,7 +36,7 @@ all_project_ci_trunk_weekly_trunk: triggers: recurring: - branch: master - frequency: weekly + frequency: 1 * * ? dependencies: - path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk rerun: on_new_revision @@ -123,120 +104,6 @@ Trunk_verification_trunk: rerun: on_new_revision - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk rerun: on_new_revision -all_project_ci_2021.2: - name: ABV (all PR jobs) on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#PR_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#PR_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#PR_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -all_project_ci_nightly_2021.2: - name: Nightly on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - triggers: - recurring: - - branch: master - frequency: 1 * * ? - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -all_project_ci_trunk_weekly_2021.2: - name: Trunk Weekly on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -General_Checks_2021.2: - name: General Checks on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/_projectcontext.yml#all_package_ci_project_2021.2 - rerun: on_new_revision - - path: .yamato/_formatting.yml#formatting - rerun: on_new_revision - - path: .yamato/all-smoke_test.yml#Smoke_Test_2021.2 - rerun: on_new_revision -Trunk_verification_2021.2: - name: Trunk verification on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision all_project_ci_CUSTOM-REVISION: name: ABV (all PR jobs) on CUSTOM-REVISION variables: @@ -273,24 +140,6 @@ all_project_ci_nightly_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION rerun: on_new_revision -all_project_ci_trunk_weekly_CUSTOM-REVISION: - name: Trunk Weekly on CUSTOM-REVISION - variables: - CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION - rerun: on_new_revision General_Checks_CUSTOM-REVISION: name: General Checks on CUSTOM-REVISION variables: diff --git a/.yamato/_editor_pinning.yml b/.yamato/_editor_pinning.yml index 49d4db423c1..428c9c97e28 100644 --- a/.yamato/_editor_pinning.yml +++ b/.yamato/_editor_pinning.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -28,8 +27,7 @@ editor-pinning-update: - git config --global user.name "noreply@unity3d.com" - git config --global user.email "noreply@unity3d.com" - git checkout $GIT_BRANCH - - python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 1 - - python3 .yamato/script/editor_scripts/update_revisions.py --track 2021.2 --ono-branch $ONO_BRANCH_2021_2 --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 100 + - python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 100 triggers: recurring: - branch: master diff --git a/.yamato/_editor_priming.yml b/.yamato/_editor_priming.yml index 8373d24a985..70a3e1ae8b2 100644 --- a/.yamato/_editor_priming.yml +++ b/.yamato/_editor_priming.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -32,29 +31,6 @@ editor:priming:trunk:Win: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:Win: - name: '[2021.2,Win] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:Win: name: '[CUSTOM-REVISION,Win] Editor priming' agent: @@ -124,29 +100,6 @@ editor:priming:trunk:OSX: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:OSX: - name: '[2021.2,OSX] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:OSX: name: '[CUSTOM-REVISION,OSX] Editor priming' agent: @@ -216,29 +169,6 @@ editor:priming:trunk:Linux: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:Linux: - name: '[2021.2,Linux] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:Linux: name: '[CUSTOM-REVISION,Linux] Editor priming' agent: @@ -308,29 +238,6 @@ editor:priming:trunk:Android: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:Android: - name: '[2021.2,Android] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:Android: name: '[CUSTOM-REVISION,Android] Editor priming' agent: @@ -400,29 +307,6 @@ editor:priming:trunk:XRQuest: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:XRQuest: - name: '[2021.2,XRQuest] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:XRQuest: name: '[CUSTOM-REVISION,XRQuest] Editor priming' agent: @@ -492,29 +376,6 @@ editor:priming:trunk:iPhone: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:iPhone: - name: '[2021.2,iPhone] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp -c ios > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:iPhone: name: '[CUSTOM-REVISION,iPhone] Editor priming' agent: diff --git a/.yamato/_latest_editor_versions_2021.2.metafile b/.yamato/_latest_editor_versions_2021.2.metafile deleted file mode 100644 index dc987cdcaff..00000000000 --- a/.yamato/_latest_editor_versions_2021.2.metafile +++ /dev/null @@ -1,5 +0,0 @@ -'2021_2': - updated_at_UTC: '2021-09-01 00:01:18.867712' - changeset: - id: fa287a10460c816514a14d21feeadbf2192df9e8 - date: '2021-08-31T13:45:37' diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index 627383f8b93..f54ae23ed34 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -266,46 +265,6 @@ test_all_project_OSX_trunk: - "**/test-results/**" variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' -test_all_project_Win_2021.2: - name: Test all packages [project context] Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_projectcontext.yml#pack_all_project - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' -test_all_project_OSX_2021.2: - name: Test all packages [project context] OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_projectcontext.yml#pack_all_project - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' test_all_project_Win_CUSTOM-REVISION: name: Test all packages [project context] Win CUSTOM-REVISION agent: @@ -399,23 +358,6 @@ all_package_ci_project_trunk: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -all_package_ci_project_2021.2: - name: Pack and test all packages - 2021.2 [project context] - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_projectcontext.yml#test_all_project_Win_2021.2 - - .yamato/_projectcontext.yml#test_all_project_Win_min_editor - - .yamato/_projectcontext.yml#test_all_project_OSX_2021.2 - - .yamato/_projectcontext.yml#test_all_project_OSX_min_editor - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package izon -t - - upm-ci package izon -d all_package_ci_project_CUSTOM-REVISION: name: Pack and test all packages - CUSTOM-REVISION [project context] agent: diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index 6b8991f226d..23baca71867 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -155,152 +154,6 @@ publish_hdrp_template_trunk_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_hdrp_template_Win_2021.2: - name: Pre-Pack HDRP Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - artifacts: - primed: - paths: - - "com.unity.template-hd/Library/Artifacts/**" - - "com.unity.template-hd/Library/ArtifactDB" - - "com.unity.template-hd/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_template_Win_2021.2: - name: Pack HDRP Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_Win_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_template_Win_2021.2: - name: Test HDRP Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_hdrp_template_Win_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template-hd - artifacts: - logs: - paths: - - "**/test-results/**" -pre_pack_hdrp_template_OSX_2021.2: - name: Pre-Pack HDRP Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - artifacts: - primed: - paths: - - "com.unity.template-hd/Library/Artifacts/**" - - "com.unity.template-hd/Library/ArtifactDB" - - "com.unity.template-hd/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_template_OSX_2021.2: - name: Pack HDRP Template OSX 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_template_OSX_2021.2: - name: Test HDRP Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_hdrp_template_OSX_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd - artifacts: - logs: - paths: - - "**/test-results/**" -publish_hdrp_template_2021.2: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish HDRP Template 2021.2 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#test_hdrp_template_OSX_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_hdrp_template_2021.2_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish HDRP Template 2021.2 Dry Run - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-hd --dry-run - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#test_hdrp_template_OSX_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" pre_pack_hdrp_template_Win_CUSTOM-REVISION: name: Pre-Pack HDRP Template Win CUSTOM-REVISION agent: @@ -593,152 +446,6 @@ publish_universal_template_trunk_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_universal_template_Win_2021.2: - name: Pre-Pack Universal Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - artifacts: - primed: - paths: - - "com.unity.template-universal/Library/Artifacts/**" - - "com.unity.template-universal/Library/ArtifactDB" - - "com.unity.template-universal/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_universal_template_Win_2021.2: - name: Pack Universal Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_Win_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_universal_template_Win_2021.2: - name: Test Universal Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_universal_template_Win_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template-universal - artifacts: - logs: - paths: - - "**/test-results/**" -pre_pack_universal_template_OSX_2021.2: - name: Pre-Pack Universal Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - artifacts: - primed: - paths: - - "com.unity.template-universal/Library/Artifacts/**" - - "com.unity.template-universal/Library/ArtifactDB" - - "com.unity.template-universal/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_universal_template_OSX_2021.2: - name: Pack Universal Template OSX 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_universal_template_OSX_2021.2: - name: Test Universal Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_universal_template_OSX_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal - artifacts: - logs: - paths: - - "**/test-results/**" -publish_universal_template_2021.2: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish Universal Template 2021.2 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#test_universal_template_Win_2021.2 - - .yamato/_templates.yml#test_universal_template_OSX_2021.2 - - .yamato/_templates.yml#pack_universal_template_Win_2021.2 - - .yamato/_templates.yml#pack_universal_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_universal_template_2021.2_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish Universal Template 2021.2 Dry Run - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-universal --dry-run - dependencies: - - .yamato/_templates.yml#test_universal_template_Win_2021.2 - - .yamato/_templates.yml#test_universal_template_OSX_2021.2 - - .yamato/_templates.yml#pack_universal_template_Win_2021.2 - - .yamato/_templates.yml#pack_universal_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_CUSTOM-REVISION: name: Pre-Pack Universal Template Win CUSTOM-REVISION agent: @@ -900,21 +607,6 @@ all_template_ci_trunk: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -all_template_ci_2021.2: - name: Pack and test all templates - 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#test_universal_template_Win_2021.2 - - .yamato/_templates.yml#test_hdrp_template_OSX_2021.2 - - .yamato/_templates.yml#test_universal_template_OSX_2021.2 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package izon -t - - upm-ci package izon -d all_template_ci_CUSTOM-REVISION: name: Pack and test all templates - CUSTOM-REVISION agent: diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index 321e4b9167e..45836272539 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ Nightly_HDRP_trunk: rerun: on_new_revision - path: .yamato/all-hdrp.yml#HDRP_trunk rerun: on_new_revision -PR_HDRP_2021.2: - name: PR HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_HDRP_2021.2: - name: Extra HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -HDRP_2021.2: - name: HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#PR_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp.yml#Extra_HDRP_2021.2 - rerun: on_new_revision -Nightly_HDRP_2021.2: - name: Nightly HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp_performancetests.yml#HDRP_PerformanceTests_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_dxr.yml#HDRP_DXR_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp.yml#HDRP_2021.2 - rerun: on_new_revision PR_HDRP_CUSTOM-REVISION: name: PR HDRP on CUSTOM-REVISION variables: diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml index cebed11013c..f89677fc185 100644 --- a/.yamato/all-hdrp_dxr.yml +++ b/.yamato/all-hdrp_dxr.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ HDRP_DXR_trunk: rerun: on_new_revision - path: .yamato/all-hdrp_dxr.yml#Extra_HDRP_DXR_trunk rerun: on_new_revision -PR_HDRP_DXR_2021.2: - name: PR HDRP_DXR on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_HDRP_DXR_2021.2: - name: Extra HDRP_DXR on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision -HDRP_DXR_2021.2: - name: HDRP_DXR on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_dxr.yml#Extra_HDRP_DXR_2021.2 - rerun: on_new_revision PR_HDRP_DXR_CUSTOM-REVISION: name: PR HDRP_DXR on CUSTOM-REVISION variables: diff --git a/.yamato/all-hdrp_hybrid.yml b/.yamato/all-hdrp_hybrid.yml index 3c7ac979f19..5a6b9a11da3 100644 --- a/.yamato/all-hdrp_hybrid.yml +++ b/.yamato/all-hdrp_hybrid.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ HDRP_Hybrid_trunk: rerun: on_new_revision - path: .yamato/all-hdrp_hybrid.yml#Extra_HDRP_Hybrid_trunk rerun: on_new_revision -PR_HDRP_Hybrid_2021.2: - name: PR HDRP_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_HDRP_Hybrid_2021.2: - name: Extra HDRP_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision -HDRP_Hybrid_2021.2: - name: HDRP_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_hybrid.yml#Extra_HDRP_Hybrid_2021.2 - rerun: on_new_revision PR_HDRP_Hybrid_CUSTOM-REVISION: name: PR HDRP_Hybrid on CUSTOM-REVISION variables: diff --git a/.yamato/all-hdrp_performancetests.yml b/.yamato/all-hdrp_performancetests.yml index 54606caf745..3b15340f14b 100644 --- a/.yamato/all-hdrp_performancetests.yml +++ b/.yamato/all-hdrp_performancetests.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -22,19 +21,6 @@ HDRP_PerformanceTests_trunk: rerun: on_new_revision - path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_run_build_il2cpp_Linear_trunk rerun: on_new_revision -HDRP_PerformanceTests_2021.2: - name: HDRP_PerformanceTests on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - GIT_BRANCH: master - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_memory_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_run_build_il2cpp_Linear_2021.2 - rerun: on_new_revision HDRP_PerformanceTests_CUSTOM-REVISION: name: HDRP_PerformanceTests on CUSTOM-REVISION variables: diff --git a/.yamato/all-postprocessing.yml b/.yamato/all-postprocessing.yml index 9fd45348bfa..516c4061bb9 100644 --- a/.yamato/all-postprocessing.yml +++ b/.yamato/all-postprocessing.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -59,56 +58,6 @@ PostProcessing_trunk: rerun: on_new_revision - path: .yamato/all-postprocessing.yml#Extra_PostProcessing_trunk rerun: on_new_revision -PR_PostProcessing_2021.2: - name: PR PostProcessing on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-osx-metal.yml#PostProcessing_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_PostProcessing_2021.2: - name: Extra PostProcessing on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_editmode_mono_Linear_2021.2 - rerun: on_new_revision -PostProcessing_2021.2: - name: PostProcessing on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-postprocessing.yml#PR_PostProcessing_2021.2 - rerun: on_new_revision - - path: .yamato/all-postprocessing.yml#Extra_PostProcessing_2021.2 - rerun: on_new_revision PR_PostProcessing_CUSTOM-REVISION: name: PR PostProcessing on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph.yml b/.yamato/all-shadergraph.yml index 4be4ab8cbb0..b3a93b101ec 100644 --- a/.yamato/all-shadergraph.yml +++ b/.yamato/all-shadergraph.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ Nightly_ShaderGraph_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_builtin_lighting.yml#ShaderGraph_BuiltIn_Lighting_trunk rerun: on_new_revision -PR_ShaderGraph_2021.2: - name: PR ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-osx-metal.yml#ShaderGraph_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_2021.2: - name: Extra ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -ShaderGraph_2021.2: - name: ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Extra_ShaderGraph_2021.2 - rerun: on_new_revision -Nightly_ShaderGraph_2021.2: - name: Nightly ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph.yml#ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_stereo.yml#ShaderGraph_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_foundation.yml#ShaderGraph_BuiltIn_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_lighting.yml#ShaderGraph_BuiltIn_Lighting_2021.2 - rerun: on_new_revision PR_ShaderGraph_CUSTOM-REVISION: name: PR ShaderGraph on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph_builtin_foundation.yml b/.yamato/all-shadergraph_builtin_foundation.yml index 341640582b3..142de1c26b7 100644 --- a/.yamato/all-shadergraph_builtin_foundation.yml +++ b/.yamato/all-shadergraph_builtin_foundation.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -45,42 +44,6 @@ ShaderGraph_BuiltIn_Foundation_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_builtin_foundation.yml#Extra_ShaderGraph_BuiltIn_Foundation_trunk rerun: on_new_revision -PR_ShaderGraph_BuiltIn_Foundation_2021.2: - name: PR ShaderGraph_BuiltIn_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph_builtin_foundation-win-dx11.yml#ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_foundation-osx-openglcore.yml#ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_foundation-linux-vulkan.yml#ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_foundation-osx-metal.yml#ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_BuiltIn_Foundation_2021.2: - name: Extra ShaderGraph_BuiltIn_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -ShaderGraph_BuiltIn_Foundation_2021.2: - name: ShaderGraph_BuiltIn_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph_builtin_foundation.yml#PR_ShaderGraph_BuiltIn_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_foundation.yml#Extra_ShaderGraph_BuiltIn_Foundation_2021.2 - rerun: on_new_revision PR_ShaderGraph_BuiltIn_Foundation_CUSTOM-REVISION: name: PR ShaderGraph_BuiltIn_Foundation on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph_builtin_lighting.yml b/.yamato/all-shadergraph_builtin_lighting.yml index 9c9a936fbd6..dfe56b5b5b3 100644 --- a/.yamato/all-shadergraph_builtin_lighting.yml +++ b/.yamato/all-shadergraph_builtin_lighting.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -45,42 +44,6 @@ ShaderGraph_BuiltIn_Lighting_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_builtin_lighting.yml#Extra_ShaderGraph_BuiltIn_Lighting_trunk rerun: on_new_revision -PR_ShaderGraph_BuiltIn_Lighting_2021.2: - name: PR ShaderGraph_BuiltIn_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph_builtin_lighting-win-dx11.yml#ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_lighting-osx-openglcore.yml#ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_lighting-linux-vulkan.yml#ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_lighting-osx-metal.yml#ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_BuiltIn_Lighting_2021.2: - name: Extra ShaderGraph_BuiltIn_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -ShaderGraph_BuiltIn_Lighting_2021.2: - name: ShaderGraph_BuiltIn_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph_builtin_lighting.yml#PR_ShaderGraph_BuiltIn_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_lighting.yml#Extra_ShaderGraph_BuiltIn_Lighting_2021.2 - rerun: on_new_revision PR_ShaderGraph_BuiltIn_Lighting_CUSTOM-REVISION: name: PR ShaderGraph_BuiltIn_Lighting on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph_stereo.yml b/.yamato/all-shadergraph_stereo.yml index 8d73dec3330..ed1ecb70f1d 100644 --- a/.yamato/all-shadergraph_stereo.yml +++ b/.yamato/all-shadergraph_stereo.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ ShaderGraph_Stereo_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_stereo.yml#Extra_ShaderGraph_Stereo_trunk rerun: on_new_revision -PR_ShaderGraph_Stereo_2021.2: - name: PR ShaderGraph_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_editmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_Stereo_2021.2: - name: Extra ShaderGraph_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -ShaderGraph_Stereo_2021.2: - name: ShaderGraph_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_stereo.yml#Extra_ShaderGraph_Stereo_2021.2 - rerun: on_new_revision PR_ShaderGraph_Stereo_CUSTOM-REVISION: name: PR ShaderGraph_Stereo on CUSTOM-REVISION variables: diff --git a/.yamato/all-smoke_test.yml b/.yamato/all-smoke_test.yml index 0894abeda52..8b5e8ea36cf 100644 --- a/.yamato/all-smoke_test.yml +++ b/.yamato/all-smoke_test.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -43,40 +42,6 @@ Smoke_Test_trunk: rerun: on_new_revision - path: .yamato/all-smoke_test.yml#Extra_Smoke_Test_trunk rerun: on_new_revision -PR_Smoke_Test_2021.2: - name: PR Smoke_Test on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_Smoke_Test_2021.2: - name: Extra Smoke_Test on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -Smoke_Test_2021.2: - name: Smoke_Test on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-smoke_test.yml#PR_Smoke_Test_2021.2 - rerun: on_new_revision - - path: .yamato/all-smoke_test.yml#Extra_Smoke_Test_2021.2 - rerun: on_new_revision PR_Smoke_Test_CUSTOM-REVISION: name: PR Smoke_Test on CUSTOM-REVISION variables: diff --git a/.yamato/all-universal_hybrid.yml b/.yamato/all-universal_hybrid.yml index 2bbd6056d41..dcf390e2b06 100644 --- a/.yamato/all-universal_hybrid.yml +++ b/.yamato/all-universal_hybrid.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ Universal_Hybrid_trunk: rerun: on_new_revision - path: .yamato/all-universal_hybrid.yml#Extra_Universal_Hybrid_trunk rerun: on_new_revision -PR_Universal_Hybrid_2021.2: - name: PR Universal_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/universal_hybrid-win-dx11.yml#Universal_Hybrid_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/universal_hybrid-osx-metal.yml#Universal_Hybrid_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_Universal_Hybrid_2021.2: - name: Extra Universal_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -Universal_Hybrid_2021.2: - name: Universal_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_hybrid.yml#Extra_Universal_Hybrid_2021.2 - rerun: on_new_revision PR_Universal_Hybrid_CUSTOM-REVISION: name: PR Universal_Hybrid on CUSTOM-REVISION variables: diff --git a/.yamato/all-universal_split.yml b/.yamato/all-universal_split.yml index a712421578f..28cc04c2dc3 100644 --- a/.yamato/all-universal_split.yml +++ b/.yamato/all-universal_split.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -45,42 +44,6 @@ Extra_Universal_Split_trunk: rerun: on_new_revision - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_trunk rerun: on_new_revision -PR_Universal_Split_2021.2: - name: PR Universal_Split on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_2d.yml#PR_URP_2D_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_foundation.yml#PR_URP_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_lighting.yml#PR_URP_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_terrain.yml#PR_URP_Terrain_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_postpro.yml#PR_URP_PostPro_2021.2 - rerun: on_new_revision -Extra_Universal_Split_2021.2: - name: Extra Universal_Split on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_2d.yml#Extra_URP_2D_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_foundation.yml#Extra_URP_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_lighting.yml#Extra_URP_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_terrain.yml#Extra_URP_Terrain_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_2021.2 - rerun: on_new_revision PR_Universal_Split_CUSTOM-REVISION: name: PR Universal_Split on CUSTOM-REVISION variables: diff --git a/.yamato/all-universal_stereo.yml b/.yamato/all-universal_stereo.yml index 3d9e79d32ea..7ce3de07dd6 100644 --- a/.yamato/all-universal_stereo.yml +++ b/.yamato/all-universal_stereo.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ Universal_Stereo_trunk: rerun: on_new_revision - path: .yamato/all-universal_stereo.yml#Extra_Universal_Stereo_trunk rerun: on_new_revision -PR_Universal_Stereo_2021.2: - name: PR Universal_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_editmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_Universal_Stereo_2021.2: - name: Extra Universal_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -Universal_Stereo_2021.2: - name: Universal_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_stereo.yml#Extra_Universal_Stereo_2021.2 - rerun: on_new_revision PR_Universal_Stereo_CUSTOM-REVISION: name: PR Universal_Stereo on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp.yml b/.yamato/all-urp.yml index 036c122145c..50a831bd22f 100644 --- a/.yamato/all-urp.yml +++ b/.yamato/all-urp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -71,68 +70,6 @@ Nightly_URP_trunk: rerun: on_new_revision - path: .yamato/urp_upgrade.yml#URP_Upgrade_test_win_trunk rerun: on_new_revision -PR_URP_2021.2: - name: PR URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_split.yml#PR_Universal_Split_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate.yml#PR_URPUpdate_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_URP_2021.2: - name: Extra URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_split.yml#Extra_Universal_Split_2021.2 - rerun: on_new_revision -URP_2021.2: - name: URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp.yml#PR_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#Extra_URP_2021.2 - rerun: on_new_revision -Nightly_URP_2021.2: - name: Nightly URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp.yml#URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_stereo.yml#Universal_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate.yml#URPUpdate_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_perf.yml#URP_Perf_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate_top_asset_store.yml#URPUpdate_Top_Asset_Store_2021.2 - rerun: on_new_revision - - path: .yamato/urp_upgrade.yml#URP_Upgrade_test_win_2021.2 - rerun: on_new_revision PR_URP_CUSTOM-REVISION: name: PR URP on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_2d.yml b/.yamato/all-urp_2d.yml index 83946fa4bd4..310c8eb27db 100644 --- a/.yamato/all-urp_2d.yml +++ b/.yamato/all-urp_2d.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -73,70 +72,6 @@ URP_2D_trunk: rerun: on_new_revision - path: .yamato/all-urp_2d.yml#Extra_URP_2D_trunk rerun: on_new_revision -PR_URP_2D_2021.2: - name: PR URP_2D on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx12.yml#URP_2D_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-vulkan.yml#URP_2D_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-linux-vulkan.yml#URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-osx-metal.yml#URP_2D_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-osx-openglcore.yml#URP_2D_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_2D_2021.2: - name: Extra URP_2D on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx12.yml#URP_2D_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-vulkan.yml#URP_2D_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-linux-vulkan.yml#URP_2D_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_2D_2021.2: - name: URP_2D on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_2d.yml#PR_URP_2D_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_2d.yml#Extra_URP_2D_2021.2 - rerun: on_new_revision PR_URP_2D_CUSTOM-REVISION: name: PR URP_2D on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_foundation.yml b/.yamato/all-urp_foundation.yml index 09b549857c8..47cbc8c6832 100644 --- a/.yamato/all-urp_foundation.yml +++ b/.yamato/all-urp_foundation.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_Foundation_trunk: rerun: on_new_revision - path: .yamato/all-urp_foundation.yml#Extra_URP_Foundation_trunk rerun: on_new_revision -PR_URP_Foundation_2021.2: - name: PR URP_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx12.yml#URP_Foundation_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx12.yml#URP_Foundation_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-vulkan.yml#URP_Foundation_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-linux-vulkan.yml#URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-osx-metal.yml#URP_Foundation_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-osx-openglcore.yml#URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_Foundation_2021.2: - name: Extra URP_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx12.yml#URP_Foundation_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-vulkan.yml#URP_Foundation_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-linux-vulkan.yml#URP_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_Foundation_2021.2: - name: URP_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_foundation.yml#PR_URP_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_foundation.yml#Extra_URP_Foundation_2021.2 - rerun: on_new_revision PR_URP_Foundation_CUSTOM-REVISION: name: PR URP_Foundation on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_lighting.yml b/.yamato/all-urp_lighting.yml index 21b5451129b..b32e2e0cbd4 100644 --- a/.yamato/all-urp_lighting.yml +++ b/.yamato/all-urp_lighting.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_Lighting_trunk: rerun: on_new_revision - path: .yamato/all-urp_lighting.yml#Extra_URP_Lighting_trunk rerun: on_new_revision -PR_URP_Lighting_2021.2: - name: PR URP_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx12.yml#URP_Lighting_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx12.yml#URP_Lighting_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-vulkan.yml#URP_Lighting_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-linux-vulkan.yml#URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-osx-metal.yml#URP_Lighting_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-osx-openglcore.yml#URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_Lighting_2021.2: - name: Extra URP_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx12.yml#URP_Lighting_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-vulkan.yml#URP_Lighting_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-linux-vulkan.yml#URP_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_Lighting_2021.2: - name: URP_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_lighting.yml#PR_URP_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_lighting.yml#Extra_URP_Lighting_2021.2 - rerun: on_new_revision PR_URP_Lighting_CUSTOM-REVISION: name: PR URP_Lighting on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_perf.yml b/.yamato/all-urp_perf.yml index 18d2e334be6..702ec8ec453 100644 --- a/.yamato/all-urp_perf.yml +++ b/.yamato/all-urp_perf.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -25,22 +24,6 @@ URP_Perf_trunk: rerun: on_new_revision - path: .yamato/all-vikingvillage_urp.yml#VikingVillage_URP_trunk rerun: on_new_revision -URP_Perf_2021.2: - name: URP_Perf on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_performance_boatattack.yml#URP_Performance_BoatAttack_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_performance_lostcrypt.yml#URP_Performance_LostCrypt_2021.2 - rerun: on_new_revision - - path: .yamato/all-vikingvillage_builtin.yml#VikingVillage_BuiltIn_2021.2 - rerun: on_new_revision - - path: .yamato/all-vikingvillage_urp.yml#VikingVillage_URP_2021.2 - rerun: on_new_revision URP_Perf_CUSTOM-REVISION: name: URP_Perf on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_performance_boatattack.yml b/.yamato/all-urp_performance_boatattack.yml index 9a40c126936..22cff2315b9 100644 --- a/.yamato/all-urp_performance_boatattack.yml +++ b/.yamato/all-urp_performance_boatattack.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -57,54 +56,6 @@ URP_Performance_BoatAttack_trunk: rerun: on_new_revision - path: .yamato/urp_performance_boatattack-xrquest-vulkan.yml#URP_Performance_BoatAttack_XRQuest_Vulkan_performance_playmode_runtime_il2cpp_Linear_trunk rerun: on_new_revision -URP_Performance_BoatAttack_2021.2: - name: URP_Performance_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-vulkan.yml#URP_Performance_BoatAttack_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-vulkan.yml#URP_Performance_BoatAttack_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx12.yml#URP_Performance_BoatAttack_Win_DX12_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx12.yml#URP_Performance_BoatAttack_Win_DX12_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx12.yml#URP_Performance_BoatAttack_Win_DX12_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-linux-vulkan.yml#URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-linux-vulkan.yml#URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-linux-vulkan.yml#URP_Performance_BoatAttack_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-xrquest-opengles3.yml#URP_Performance_BoatAttack_XRQuest_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-xrquest-vulkan.yml#URP_Performance_BoatAttack_XRQuest_Vulkan_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision URP_Performance_BoatAttack_CUSTOM-REVISION: name: URP_Performance_BoatAttack on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_performance_lostcrypt.yml b/.yamato/all-urp_performance_lostcrypt.yml index 63341cb352a..861db377482 100644 --- a/.yamato/all-urp_performance_lostcrypt.yml +++ b/.yamato/all-urp_performance_lostcrypt.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URP_Performance_LostCrypt_trunk: rerun: on_new_revision - path: .yamato/urp_performance_lostcrypt-iphone-metal.yml#URP_Performance_LostCrypt_iPhone_Metal_performance_build_editmode_il2cpp_Linear_trunk rerun: on_new_revision -URP_Performance_LostCrypt_2021.2: - name: URP_Performance_LostCrypt on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_performance_lostcrypt-win-dx11.yml#URP_Performance_LostCrypt_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx11.yml#URP_Performance_LostCrypt_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx11.yml#URP_Performance_LostCrypt_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-vulkan.yml#URP_Performance_LostCrypt_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-vulkan.yml#URP_Performance_LostCrypt_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx12.yml#URP_Performance_LostCrypt_Win_DX12_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx12.yml#URP_Performance_LostCrypt_Win_DX12_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx12.yml#URP_Performance_LostCrypt_Win_DX12_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-opengles3.yml#URP_Performance_LostCrypt_Android_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-opengles3.yml#URP_Performance_LostCrypt_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-vulkan.yml#URP_Performance_LostCrypt_Android_Vulkan_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-vulkan.yml#URP_Performance_LostCrypt_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-iphone-metal.yml#URP_Performance_LostCrypt_iPhone_Metal_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-iphone-metal.yml#URP_Performance_LostCrypt_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision URP_Performance_LostCrypt_CUSTOM-REVISION: name: URP_Performance_LostCrypt on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_postpro.yml b/.yamato/all-urp_postpro.yml index 14414281da6..5d5550998f0 100644 --- a/.yamato/all-urp_postpro.yml +++ b/.yamato/all-urp_postpro.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_PostPro_trunk: rerun: on_new_revision - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_trunk rerun: on_new_revision -PR_URP_PostPro_2021.2: - name: PR URP_PostPro on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx12.yml#URP_PostPro_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx12.yml#URP_PostPro_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-vulkan.yml#URP_PostPro_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-linux-vulkan.yml#URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-opengles3.yml#URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-vulkan.yml#URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-iphone-metal.yml#URP_PostPro_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-osx-metal.yml#URP_PostPro_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-osx-openglcore.yml#URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-opengles3.yml#URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-vulkan.yml#URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-iphone-metal.yml#URP_PostPro_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_PostPro_2021.2: - name: Extra URP_PostPro on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx12.yml#URP_PostPro_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-vulkan.yml#URP_PostPro_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-linux-vulkan.yml#URP_PostPro_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_PostPro_2021.2: - name: URP_PostPro on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_postpro.yml#PR_URP_PostPro_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_2021.2 - rerun: on_new_revision PR_URP_PostPro_CUSTOM-REVISION: name: PR URP_PostPro on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_terrain.yml b/.yamato/all-urp_terrain.yml index 4ee9c7a5dbc..b29c750de0c 100644 --- a/.yamato/all-urp_terrain.yml +++ b/.yamato/all-urp_terrain.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_Terrain_trunk: rerun: on_new_revision - path: .yamato/all-urp_terrain.yml#Extra_URP_Terrain_trunk rerun: on_new_revision -PR_URP_Terrain_2021.2: - name: PR URP_Terrain on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx12.yml#URP_Terrain_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx12.yml#URP_Terrain_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-vulkan.yml#URP_Terrain_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-linux-vulkan.yml#URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-opengles3.yml#URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-osx-metal.yml#URP_Terrain_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-osx-openglcore.yml#URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-opengles3.yml#URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_Terrain_2021.2: - name: Extra URP_Terrain on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx12.yml#URP_Terrain_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-vulkan.yml#URP_Terrain_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-linux-vulkan.yml#URP_Terrain_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_Terrain_2021.2: - name: URP_Terrain on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_terrain.yml#PR_URP_Terrain_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_terrain.yml#Extra_URP_Terrain_2021.2 - rerun: on_new_revision PR_URP_Terrain_CUSTOM-REVISION: name: PR URP_Terrain on CUSTOM-REVISION variables: diff --git a/.yamato/all-urpupdate.yml b/.yamato/all-urpupdate.yml index 54d283bc255..a7b7967ccb0 100644 --- a/.yamato/all-urpupdate.yml +++ b/.yamato/all-urpupdate.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URPUpdate_trunk: rerun: on_new_revision - path: .yamato/all-urpupdate.yml#Extra_URPUpdate_trunk rerun: on_new_revision -PR_URPUpdate_2021.2: - name: PR URPUpdate on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - TEMPLATE_UPDATE_PROJECT_BRANCH: master - TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_URPUpdate_2021.2: - name: Extra URPUpdate on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - TEMPLATE_UPDATE_PROJECT_BRANCH: master - TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -URPUpdate_2021.2: - name: URPUpdate on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - TEMPLATE_UPDATE_PROJECT_BRANCH: master - TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urpupdate.yml#PR_URPUpdate_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate.yml#Extra_URPUpdate_2021.2 - rerun: on_new_revision PR_URPUpdate_CUSTOM-REVISION: name: PR URPUpdate on CUSTOM-REVISION variables: diff --git a/.yamato/all-urpupdate_boatattack.yml b/.yamato/all-urpupdate_boatattack.yml index dc79780ed38..630a9818888 100644 --- a/.yamato/all-urpupdate_boatattack.yml +++ b/.yamato/all-urpupdate_boatattack.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URPUpdate_BoatAttack_trunk: rerun: on_new_revision - path: .yamato/all-urpupdate_boatattack.yml#Extra_URPUpdate_BoatAttack_trunk rerun: on_new_revision -PR_URPUpdate_BoatAttack_2021.2: - name: PR URPUpdate_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BA_UPDATE_PROJECT_BRANCH: master - BA_UPDATE_PROJECT_REVISION: 06c67d682225354dd909728e2511ac17115b18b9 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_URPUpdate_BoatAttack_2021.2: - name: Extra URPUpdate_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BA_UPDATE_PROJECT_BRANCH: master - BA_UPDATE_PROJECT_REVISION: 06c67d682225354dd909728e2511ac17115b18b9 - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -URPUpdate_BoatAttack_2021.2: - name: URPUpdate_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BA_UPDATE_PROJECT_BRANCH: master - BA_UPDATE_PROJECT_REVISION: 06c67d682225354dd909728e2511ac17115b18b9 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urpupdate_boatattack.yml#PR_URPUpdate_BoatAttack_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate_boatattack.yml#Extra_URPUpdate_BoatAttack_2021.2 - rerun: on_new_revision PR_URPUpdate_BoatAttack_CUSTOM-REVISION: name: PR URPUpdate_BoatAttack on CUSTOM-REVISION variables: diff --git a/.yamato/all-urpupdate_top_asset_store.yml b/.yamato/all-urpupdate_top_asset_store.yml index b16d079a260..68f94cab543 100644 --- a/.yamato/all-urpupdate_top_asset_store.yml +++ b/.yamato/all-urpupdate_top_asset_store.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URPUpdate_Top_Asset_Store_trunk: rerun: on_new_revision - path: .yamato/all-urpupdate_top_asset_store.yml#Extra_URPUpdate_Top_Asset_Store_trunk rerun: on_new_revision -PR_URPUpdate_Top_Asset_Store_2021.2: - name: PR URPUpdate_Top_Asset_Store on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - ASSETSTORE_UPDATE_PROJECT_BRANCH: master - ASSETSTORE_UPDATE_PROJECT_REVISION: 263537e22614f3b98eba4f56cea3fd4519312b2f - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_URPUpdate_Top_Asset_Store_2021.2: - name: Extra URPUpdate_Top_Asset_Store on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - ASSETSTORE_UPDATE_PROJECT_BRANCH: master - ASSETSTORE_UPDATE_PROJECT_REVISION: 263537e22614f3b98eba4f56cea3fd4519312b2f - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -URPUpdate_Top_Asset_Store_2021.2: - name: URPUpdate_Top_Asset_Store on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - ASSETSTORE_UPDATE_PROJECT_BRANCH: master - ASSETSTORE_UPDATE_PROJECT_REVISION: 263537e22614f3b98eba4f56cea3fd4519312b2f - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urpupdate_top_asset_store.yml#PR_URPUpdate_Top_Asset_Store_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate_top_asset_store.yml#Extra_URPUpdate_Top_Asset_Store_2021.2 - rerun: on_new_revision PR_URPUpdate_Top_Asset_Store_CUSTOM-REVISION: name: PR URPUpdate_Top_Asset_Store on CUSTOM-REVISION variables: diff --git a/.yamato/all-vfx.yml b/.yamato/all-vfx.yml index 2ee128c81d1..3c3ea65658f 100644 --- a/.yamato/all-vfx.yml +++ b/.yamato/all-vfx.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -57,54 +56,6 @@ Nightly_VFX_trunk: dependencies: - path: .yamato/all-vfx.yml#VFX_trunk rerun: on_new_revision -PR_VFX_2021.2: - name: PR VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_VFX_2021.2: - name: Extra VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_hdrp.yml#Extra_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#Extra_VFX_URP_2021.2 - rerun: on_new_revision -VFX_2021.2: - name: VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx.yml#PR_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Extra_VFX_2021.2 - rerun: on_new_revision -Nightly_VFX_2021.2: - name: Nightly VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx.yml#VFX_2021.2 - rerun: on_new_revision PR_VFX_CUSTOM-REVISION: name: PR VFX on CUSTOM-REVISION variables: diff --git a/.yamato/all-vfx_hdrp.yml b/.yamato/all-vfx_hdrp.yml index b0f47fbda9b..5fb965508e3 100644 --- a/.yamato/all-vfx_hdrp.yml +++ b/.yamato/all-vfx_hdrp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -57,54 +56,6 @@ VFX_HDRP_trunk: rerun: on_new_revision - path: .yamato/all-vfx_hdrp.yml#Extra_VFX_HDRP_trunk rerun: on_new_revision -PR_VFX_HDRP_2021.2: - name: PR VFX_HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Extra_VFX_HDRP_2021.2: - name: Extra VFX_HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-osx-metal.yml#VFX_HDRP_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -VFX_HDRP_2021.2: - name: VFX_HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_hdrp.yml#Extra_VFX_HDRP_2021.2 - rerun: on_new_revision PR_VFX_HDRP_CUSTOM-REVISION: name: PR VFX_HDRP on CUSTOM-REVISION variables: diff --git a/.yamato/all-vfx_urp.yml b/.yamato/all-vfx_urp.yml index a5688051a2c..2a519dafb27 100644 --- a/.yamato/all-vfx_urp.yml +++ b/.yamato/all-vfx_urp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -51,48 +50,6 @@ VFX_URP_trunk: rerun: on_new_revision - path: .yamato/all-vfx_urp.yml#Extra_VFX_URP_trunk rerun: on_new_revision -PR_VFX_URP_2021.2: - name: PR VFX_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Extra_VFX_URP_2021.2: - name: Extra VFX_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_editmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-vulkan.yml#VFX_URP_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-osx-metal.yml#VFX_URP_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -VFX_URP_2021.2: - name: VFX_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#Extra_VFX_URP_2021.2 - rerun: on_new_revision PR_VFX_URP_CUSTOM-REVISION: name: PR VFX_URP on CUSTOM-REVISION variables: diff --git a/.yamato/all-vikingvillage_builtin.yml b/.yamato/all-vikingvillage_builtin.yml index df0ef416aea..a790f2f35c8 100644 --- a/.yamato/all-vikingvillage_builtin.yml +++ b/.yamato/all-vikingvillage_builtin.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -39,36 +38,6 @@ VikingVillage_BuiltIn_trunk: rerun: on_new_revision - path: .yamato/vikingvillage_builtin-linux-vulkan.yml#VikingVillage_BuiltIn_Linux_Vulkan_performance_build_editmode_mono_Linear_trunk rerun: on_new_revision -VikingVillage_BuiltIn_2021.2: - name: VikingVillage_BuiltIn on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vikingvillage_builtin-win-dx11.yml#VikingVillage_BuiltIn_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-dx11.yml#VikingVillage_BuiltIn_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-dx11.yml#VikingVillage_BuiltIn_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-vulkan.yml#VikingVillage_BuiltIn_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-vulkan.yml#VikingVillage_BuiltIn_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-android-opengles3.yml#VikingVillage_BuiltIn_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-android-vulkan.yml#VikingVillage_BuiltIn_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-iphone-metal.yml#VikingVillage_BuiltIn_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-linux-vulkan.yml#VikingVillage_BuiltIn_Linux_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-linux-vulkan.yml#VikingVillage_BuiltIn_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision VikingVillage_BuiltIn_CUSTOM-REVISION: name: VikingVillage_BuiltIn on CUSTOM-REVISION variables: diff --git a/.yamato/all-vikingvillage_urp.yml b/.yamato/all-vikingvillage_urp.yml index 308e75976e7..196ce21bfae 100644 --- a/.yamato/all-vikingvillage_urp.yml +++ b/.yamato/all-vikingvillage_urp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -39,36 +38,6 @@ VikingVillage_URP_trunk: rerun: on_new_revision - path: .yamato/vikingvillage_urp-linux-vulkan.yml#VikingVillage_URP_Linux_Vulkan_performance_build_editmode_mono_Linear_trunk rerun: on_new_revision -VikingVillage_URP_2021.2: - name: VikingVillage_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vikingvillage_urp-win-dx11.yml#VikingVillage_URP_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-dx11.yml#VikingVillage_URP_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-dx11.yml#VikingVillage_URP_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-vulkan.yml#VikingVillage_URP_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-vulkan.yml#VikingVillage_URP_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-android-opengles3.yml#VikingVillage_URP_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-android-vulkan.yml#VikingVillage_URP_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-iphone-metal.yml#VikingVillage_URP_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-linux-vulkan.yml#VikingVillage_URP_Linux_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-linux-vulkan.yml#VikingVillage_URP_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision VikingVillage_URP_CUSTOM-REVISION: name: VikingVillage_URP on CUSTOM-REVISION variables: diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index 70253b80dce..737a7208dd5 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -10,16 +10,6 @@ editors: # applied for all yml files name: trunk rerun_strategy: on_new_revision ono_branch_var: ONO_BRANCH_TRUNK - editor_pinning: - enabled: True - nr_commits_to_retrieve: 1 - allow_triggers: True - variables: - CACHE_ARGS: '{{cache.flags}}' - - track: 2021.2 - name: 2021.2 - rerun_strategy: on_new_revision - ono_branch_var: ONO_BRANCH_2021_2 editor_pinning: enabled: True nr_commits_to_retrieve: 100 diff --git a/.yamato/config/abv.metafile b/.yamato/config/abv.metafile index c12ed4f029f..d750401ceab 100644 --- a/.yamato/config/abv.metafile +++ b/.yamato/config/abv.metafile @@ -25,21 +25,6 @@ jobs: recurring: - branch: master frequency: 1 * * ? - allow_on: - - 2021.2 - - - name: Trunk Weekly - job_id: all_project_ci_trunk_weekly - dependencies: - - .yamato/all-hdrp.yml#Nightly_HDRP_ - - .yamato/all-vfx.yml#Nightly_VFX_ - - .yamato/all-urp.yml#Nightly_URP_ - - .yamato/all-shadergraph.yml#Nightly_ShaderGraph_ - - #General_Checks_ - triggers: - recurring: - - branch: master - frequency: weekly allow_on: - trunk diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index f00e37ae65d..4e189df4448 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -283,280 +282,6 @@ Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_playmode_XR_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_playmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_editmode_XR_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_editmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-xr-reuse-tests" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_RuntimeTests --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_Standalone_XR_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --extra-editor-arg="-xr-reuse-tests" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision -Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2: - name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_XR_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-xr-reuse-tests" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_RuntimeTests --timeout=6000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision HDRP_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index cc57debb539..f10b4d47bc1 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ HDRP_OSX_Metal_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_OSX_Metal_playmode_mono_Linear_2021.2: - name: HDRP on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -HDRP_OSX_Metal_Standalone_mono_Linear_2021.2: - name: HDRP on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision HDRP_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 3cc63c994c3..b2817f263e0 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -289,286 +288,6 @@ Build_HDRP_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -HDRP_Win_DX11_playmode_mono_Linear_2021.2: - name: HDRP on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision HDRP_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_hybrid-linux-vulkan.yml b/.yamato/hdrp_hybrid-linux-vulkan.yml index a43d5a440e0..ba7bba6e27e 100644 --- a/.yamato/hdrp_hybrid-linux-vulkan.yml +++ b/.yamato/hdrp_hybrid-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -111,108 +110,6 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: HDRP_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_hybrid-osx-metal.yml b/.yamato/hdrp_hybrid-osx-metal.yml index 92d7cb4f355..af222def2a2 100644 --- a/.yamato/hdrp_hybrid-osx-metal.yml +++ b/.yamato/hdrp_hybrid-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -132,129 +131,6 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_2021.2: - name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_HybridTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_2021.2: - name: HDRP_Hybrid on OSX_Metal_playmode_XR_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_HybridTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_2021.2: - name: HDRP_Hybrid on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_HybridTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_hybrid-win-dx11.yml b/.yamato/hdrp_hybrid-win-dx11.yml index 0d14ec8a478..c75b2300a7b 100644 --- a/.yamato/hdrp_hybrid-win-dx11.yml +++ b/.yamato/hdrp_hybrid-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -149,146 +148,6 @@ Build_HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -HDRP_Hybrid_Win_DX11_playmode_mono_Linear_2021.2: - name: HDRP_Hybrid on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -PostProcessing_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: PostProcessing on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: PostProcessing on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build PostProcessing on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision PostProcessing_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: PostProcessing on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/postprocessing-osx-metal.yml b/.yamato/postprocessing-osx-metal.yml index db300b24f3b..3aff779f5d2 100644 --- a/.yamato/postprocessing-osx-metal.yml +++ b/.yamato/postprocessing-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -PostProcessing_OSX_Metal_playmode_mono_Linear_2021.2: - name: PostProcessing on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/PostProcessing_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -PostProcessing_OSX_Metal_Standalone_mono_Linear_2021.2: - name: PostProcessing on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/PostProcessing_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision PostProcessing_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: PostProcessing on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/postprocessing-win-dx11.yml b/.yamato/postprocessing-win-dx11.yml index 459f5df028b..224cb7f57e2 100644 --- a/.yamato/postprocessing-win-dx11.yml +++ b/.yamato/postprocessing-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -148,145 +147,6 @@ Build_PostProcessing_Win_DX11_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -PostProcessing_Win_DX11_playmode_mono_Linear_2021.2: - name: PostProcessing on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -ShaderGraph_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: ShaderGraph on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-linux-vulkan.yml b/.yamato/shadergraph-linux-vulkan.yml index 35441f61a5d..409825d1d97 100644 --- a/.yamato/shadergraph-linux-vulkan.yml +++ b/.yamato/shadergraph-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ ShaderGraph_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: ShaderGraph on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#Build_ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build ShaderGraph on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -ShaderGraph_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: ShaderGraph on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -ShaderGraph_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: ShaderGraph on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-osx-metal.yml b/.yamato/shadergraph-osx-metal.yml index 70235d0ebdb..2270eed796d 100644 --- a/.yamato/shadergraph-osx-metal.yml +++ b/.yamato/shadergraph-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ ShaderGraph_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_OSX_Metal_Standalone_mono_Linear_2021.2: - name: ShaderGraph on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -ShaderGraph_OSX_Metal_playmode_mono_Linear_2021.2: - name: ShaderGraph on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-osx-openglcore.yml b/.yamato/shadergraph-osx-openglcore.yml index f6dd91a57ed..3ebc0661183 100644 --- a/.yamato/shadergraph-osx-openglcore.yml +++ b/.yamato/shadergraph-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: ShaderGraph on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: ShaderGraph on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-win-dx11.yml b/.yamato/shadergraph-win-dx11.yml index a7c5aded569..5d1ee2ffe83 100644 --- a/.yamato/shadergraph-win-dx11.yml +++ b/.yamato/shadergraph-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -147,144 +146,6 @@ ShaderGraph_Win_DX11_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -ShaderGraph_Win_DX11_Standalone_mono_Linear_2021.2: - name: ShaderGraph on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml b/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml index a560d1088e0..bc0111c2b94 100644 --- a/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml +++ b/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-osx-metal.yml b/.yamato/shadergraph_builtin_foundation-osx-metal.yml index 65dfd0cb216..24554e96bf8 100644 --- a/.yamato/shadergraph_builtin_foundation-osx-metal.yml +++ b/.yamato/shadergraph_builtin_foundation-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -50,47 +49,6 @@ ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BuiltInGraphicsTest_Foundation/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Foundation/test-results/ TestProjects/BuiltInGraphicsTest_Foundation/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml b/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml index a9fd9bbe2b0..b3a750b64ac 100644 --- a/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml +++ b/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -42,39 +41,6 @@ ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-win-dx11.yml b/.yamato/shadergraph_builtin_foundation-win-dx11.yml index 8d2520d3431..ffeae147368 100644 --- a/.yamato/shadergraph_builtin_foundation-win-dx11.yml +++ b/.yamato/shadergraph_builtin_foundation-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml b/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml index 5e269f254d9..8e446d809f8 100644 --- a/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml +++ b/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-osx-metal.yml b/.yamato/shadergraph_builtin_lighting-osx-metal.yml index 25b8dffc9e7..815ef5af428 100644 --- a/.yamato/shadergraph_builtin_lighting-osx-metal.yml +++ b/.yamato/shadergraph_builtin_lighting-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -50,47 +49,6 @@ ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BuiltInGraphicsTest_Lighting/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Lighting/test-results/ TestProjects/BuiltInGraphicsTest_Lighting/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml b/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml index c7d8f26d45e..474e5a3c109 100644 --- a/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml +++ b/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -42,39 +41,6 @@ ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-win-dx11.yml b/.yamato/shadergraph_builtin_lighting-win-dx11.yml index ea25a3af212..1622ea37ca3 100644 --- a/.yamato/shadergraph_builtin_lighting-win-dx11.yml +++ b/.yamato/shadergraph_builtin_lighting-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/universal_hybrid-linux-vulkan.yml b/.yamato/universal_hybrid-linux-vulkan.yml index da9e30c3429..cf4e5ab7a99 100644 --- a/.yamato/universal_hybrid-linux-vulkan.yml +++ b/.yamato/universal_hybrid-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -111,108 +110,6 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: Universal_Hybrid on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/universal_hybrid-osx-metal.yml b/.yamato/universal_hybrid-osx-metal.yml index a1b50119db0..641af0fb653 100644 --- a/.yamato/universal_hybrid-osx-metal.yml +++ b/.yamato/universal_hybrid-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_2021.2: - name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalHybridTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -Universal_Hybrid_OSX_Metal_playmode_mono_Linear_2021.2: - name: Universal_Hybrid on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalHybridTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/universal_hybrid-win-dx11.yml b/.yamato/universal_hybrid-win-dx11.yml index f16e8816361..ac0173b891b 100644 --- a/.yamato/universal_hybrid-win-dx11.yml +++ b/.yamato/universal_hybrid-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -112,109 +111,6 @@ Universal_Hybrid_Win_DX11_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -Universal_Hybrid_Win_DX11_Standalone_mono_Linear_2021.2: - name: Universal_Hybrid on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_2D_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_2D on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_2D_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_2D on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-linux-vulkan.yml b/.yamato/urp_2d-linux-vulkan.yml index 226216ef326..11d4c29c447 100644 --- a/.yamato/urp_2d-linux-vulkan.yml +++ b/.yamato/urp_2d-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_2D_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_2D on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_2d-linux-vulkan.yml#Build_URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_2D on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_2D_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_2D on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_2D_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_2D on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_2D_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_2D on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-osx-metal.yml b/.yamato/urp_2d-osx-metal.yml index f3d7b040abe..b249c61752c 100644 --- a/.yamato/urp_2d-osx-metal.yml +++ b/.yamato/urp_2d-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -132,129 +131,6 @@ URP_2D_OSX_Metal_playmode_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_2D_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_2D on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_2D/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results/ TestProjects/UniversalGraphicsTest_2D/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_2D_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_2D on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_2D/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results/ TestProjects/UniversalGraphicsTest_2D/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_2D_OSX_Metal_playmode_XR_mono_Linear_2021.2: - name: URP_2D on OSX_Metal_playmode_XR_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_2D/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results/ TestProjects/UniversalGraphicsTest_2D/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_2D_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_2D on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-osx-openglcore.yml b/.yamato/urp_2d-osx-openglcore.yml index 40764cadbdd..fc3f626005d 100644 --- a/.yamato/urp_2d-osx-openglcore.yml +++ b/.yamato/urp_2d-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_2D_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_2D_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_2D on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_2D_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_2D on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_2D_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_2D on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-win-dx11.yml b/.yamato/urp_2d-win-dx11.yml index 0f10c85bca2..7327caae9ee 100644 --- a/.yamato/urp_2d-win-dx11.yml +++ b/.yamato/urp_2d-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -187,184 +186,6 @@ URP_2D_Win_DX11_playmode_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_2D_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_2D on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Foundation_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Foundation on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Foundation_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-linux-vulkan.yml b/.yamato/urp_foundation-linux-vulkan.yml index 57593dfb416..5d3ae0a485c 100644 --- a/.yamato/urp_foundation-linux-vulkan.yml +++ b/.yamato/urp_foundation-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_Foundation_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_Foundation on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_foundation-linux-vulkan.yml#Build_URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_Foundation on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_Foundation on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Foundation_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_Foundation on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-osx-metal.yml b/.yamato/urp_foundation-osx-metal.yml index 5aee559bf40..012ba570938 100644 --- a/.yamato/urp_foundation-osx-metal.yml +++ b/.yamato/urp_foundation-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_Foundation_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Foundation_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_Foundation on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Foundation/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results/ TestProjects/UniversalGraphicsTest_Foundation/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Foundation_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_Foundation on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Foundation/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results/ TestProjects/UniversalGraphicsTest_Foundation/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Foundation_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-osx-openglcore.yml b/.yamato/urp_foundation-osx-openglcore.yml index 8337e42df30..76de6ccc3db 100644 --- a/.yamato/urp_foundation-osx-openglcore.yml +++ b/.yamato/urp_foundation-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Foundation_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Foundation on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Foundation_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-win-dx11.yml b/.yamato/urp_foundation-win-dx11.yml index 15e93c27ae5..430c64a029d 100644 --- a/.yamato/urp_foundation-win-dx11.yml +++ b/.yamato/urp_foundation-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -260,257 +259,6 @@ Build_URP_Foundation_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Foundation_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_Foundation on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Lighting_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Lighting on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Lighting_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-linux-vulkan.yml b/.yamato/urp_lighting-linux-vulkan.yml index 88d20638edb..9b6059a77db 100644 --- a/.yamato/urp_lighting-linux-vulkan.yml +++ b/.yamato/urp_lighting-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_Lighting_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_Lighting on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_lighting-linux-vulkan.yml#Build_URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_Lighting on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_Lighting on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Lighting_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_Lighting on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-osx-metal.yml b/.yamato/urp_lighting-osx-metal.yml index 94a01b5dedf..723dbba4632 100644 --- a/.yamato/urp_lighting-osx-metal.yml +++ b/.yamato/urp_lighting-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_Lighting_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Lighting_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_Lighting on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Lighting/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results/ TestProjects/UniversalGraphicsTest_Lighting/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Lighting_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_Lighting on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Lighting/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results/ TestProjects/UniversalGraphicsTest_Lighting/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Lighting_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-osx-openglcore.yml b/.yamato/urp_lighting-osx-openglcore.yml index 1a329bb54e4..9c866af953f 100644 --- a/.yamato/urp_lighting-osx-openglcore.yml +++ b/.yamato/urp_lighting-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Lighting_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Lighting on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Lighting_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-win-dx11.yml b/.yamato/urp_lighting-win-dx11.yml index c1b4e10ed5b..34193e19cc9 100644 --- a/.yamato/urp_lighting-win-dx11.yml +++ b/.yamato/urp_lighting-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -261,258 +260,6 @@ Build_URP_Lighting_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Lighting_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_Lighting on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersLow --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/BoatAttack --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersMedium --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/BoatAttack --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersHigh --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=./TestProjects/BoatAttack --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_BoatAttack_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_BoatAttack on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_boatattack-osx-metal.yml b/.yamato/urp_performance_boatattack-osx-metal.yml index 72fadd1b41c..45a249fca72 100644 --- a/.yamato/urp_performance_boatattack-osx-metal.yml +++ b/.yamato/urp_performance_boatattack-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -231,228 +230,6 @@ URP_Performance_BoatAttack_OSX_Metal_performance_build_editmode_mono_Linear_trun dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Performance_BoatAttack_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_BoatAttack_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_BoatAttack_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Performance_BoatAttack_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_BoatAttack on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_boatattack-win-dx11.yml b/.yamato/urp_performance_boatattack-win-dx11.yml index 098a378b3c1..90eb9249a24 100644 --- a/.yamato/urp_performance_boatattack-win-dx11.yml +++ b/.yamato/urp_performance_boatattack-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -273,270 +272,6 @@ URP_Performance_BoatAttack_Win_DX11_performance_build_editmode_mono_Linear_trunk dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Performance_BoatAttack_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersLow --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/2d-sara --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersMedium --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/2d-sara --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersHigh --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=./TestProjects/2d-sara --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_LostCrypt_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_LostCrypt_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Performance_LostCrypt_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_LostCrypt on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_lostcrypt-osx-metal.yml b/.yamato/urp_performance_lostcrypt-osx-metal.yml index 716f4b0e2cf..dfe26aa56d2 100644 --- a/.yamato/urp_performance_lostcrypt-osx-metal.yml +++ b/.yamato/urp_performance_lostcrypt-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -231,228 +230,6 @@ URP_Performance_LostCrypt_OSX_Metal_performance_build_editmode_mono_Linear_trunk dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Performance_LostCrypt_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_LostCrypt_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_LostCrypt_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Performance_LostCrypt_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_LostCrypt on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_lostcrypt-win-dx11.yml b/.yamato/urp_performance_lostcrypt-win-dx11.yml index 7a438471c93..588cdb387b4 100644 --- a/.yamato/urp_performance_lostcrypt-win-dx11.yml +++ b/.yamato/urp_performance_lostcrypt-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -273,270 +272,6 @@ URP_Performance_LostCrypt_Win_DX11_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Performance_LostCrypt_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_PostPro_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_PostPro on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_PostPro_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-linux-vulkan.yml b/.yamato/urp_postpro-linux-vulkan.yml index 2a4f9620d0f..0b724e8a5ad 100644 --- a/.yamato/urp_postpro-linux-vulkan.yml +++ b/.yamato/urp_postpro-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_PostPro_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_PostPro on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_postpro-linux-vulkan.yml#Build_URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_PostPro on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_PostPro_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_PostPro on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_PostPro_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_PostPro on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-osx-metal.yml b/.yamato/urp_postpro-osx-metal.yml index 0b65c3bbd51..3c35603ddc0 100644 --- a/.yamato/urp_postpro-osx-metal.yml +++ b/.yamato/urp_postpro-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_PostPro_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_PostPro_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_PostPro on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_PostPro/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results/ TestProjects/UniversalGraphicsTest_PostPro/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_PostPro_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_PostPro on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_PostPro/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results/ TestProjects/UniversalGraphicsTest_PostPro/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_PostPro_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-osx-openglcore.yml b/.yamato/urp_postpro-osx-openglcore.yml index b2b4865ab26..e2a73ea8e72 100644 --- a/.yamato/urp_postpro-osx-openglcore.yml +++ b/.yamato/urp_postpro-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_PostPro_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_PostPro on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_PostPro on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_PostPro_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-win-dx11.yml b/.yamato/urp_postpro-win-dx11.yml index 31e26f1ea38..a6bce946a19 100644 --- a/.yamato/urp_postpro-win-dx11.yml +++ b/.yamato/urp_postpro-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -260,257 +259,6 @@ Build_URP_PostPro_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_PostPro_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_PostPro on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Terrain_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Terrain on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Terrain_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-linux-vulkan.yml b/.yamato/urp_terrain-linux-vulkan.yml index d3237086457..dffd2b9d068 100644 --- a/.yamato/urp_terrain-linux-vulkan.yml +++ b/.yamato/urp_terrain-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_Terrain_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_Terrain on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_terrain-linux-vulkan.yml#Build_URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_Terrain on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Terrain_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_Terrain on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Terrain_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_Terrain on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-osx-metal.yml b/.yamato/urp_terrain-osx-metal.yml index 3dc0b028403..23779d25575 100644 --- a/.yamato/urp_terrain-osx-metal.yml +++ b/.yamato/urp_terrain-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_Terrain_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Terrain_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_Terrain on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Terrain/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results/ TestProjects/UniversalGraphicsTest_Terrain/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Terrain_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_Terrain on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Terrain/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results/ TestProjects/UniversalGraphicsTest_Terrain/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Terrain_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-osx-openglcore.yml b/.yamato/urp_terrain-osx-openglcore.yml index 97125818a56..2832175f286 100644 --- a/.yamato/urp_terrain-osx-openglcore.yml +++ b/.yamato/urp_terrain-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Terrain_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_Terrain on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Terrain on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Terrain_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-win-dx11.yml b/.yamato/urp_terrain-win-dx11.yml index 8176114a39b..5464d7645dd 100644 --- a/.yamato/urp_terrain-win-dx11.yml +++ b/.yamato/urp_terrain-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -260,257 +259,6 @@ Build_URP_Terrain_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Terrain_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_Terrain on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_HDRP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/vfx_hdrp-linux-vulkan.yml#Build_VFX_HDRP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_HDRP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: Build VFX_HDRP on Linux_Vulkan_mono_Linear_Standalone_PerformanceTests_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_HDRP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VFX_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_HDRP on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_hdrp-osx-metal.yml b/.yamato/vfx_hdrp-osx-metal.yml index e6451a851d8..2cadf3169b4 100644 --- a/.yamato/vfx_hdrp-osx-metal.yml +++ b/.yamato/vfx_hdrp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -255,252 +254,6 @@ VFX_HDRP_OSX_Metal_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VFX_HDRP_OSX_Metal_Standalone_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_Standalone_PerformanceTests_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_playmode_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_playmode_XR_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_playmode_XR_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_playmode_PerformanceTests_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_editmode_PerformanceTests_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VFX_HDRP_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_HDRP on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_hdrp-win-dx11.yml b/.yamato/vfx_hdrp-win-dx11.yml index ebcf8199682..a11243018e7 100644 --- a/.yamato/vfx_hdrp-win-dx11.yml +++ b/.yamato/vfx_hdrp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -323,320 +322,6 @@ VFX_HDRP_Win_DX11_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VFX_HDRP_Win_DX11_Standalone_mono_Linear_2021.2: - name: VFX_HDRP on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_playmode_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VFX_URP_Linux_OpenGLCore_Standalone_PerformanceTests_mono_Linear_CUSTOM-REVISION: name: VFX_URP on Linux_OpenGLCore_Standalone_PerformanceTests_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-linux-vulkan.yml b/.yamato/vfx_urp-linux-vulkan.yml index b8292d17f9b..07f016864f9 100644 --- a/.yamato/vfx_urp-linux-vulkan.yml +++ b/.yamato/vfx_urp-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -283,280 +282,6 @@ VFX_URP_Linux_Vulkan_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -VFX_URP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_URP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build VFX_URP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_URP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: Build VFX_URP on Linux_Vulkan_mono_Linear_Standalone_PerformanceTests_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VFX_URP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_URP on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-osx-metal.yml b/.yamato/vfx_urp-osx-metal.yml index d405a6be16c..5af3b9da441 100644 --- a/.yamato/vfx_urp-osx-metal.yml +++ b/.yamato/vfx_urp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -255,252 +254,6 @@ VFX_URP_OSX_Metal_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VFX_URP_OSX_Metal_Standalone_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_Standalone_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_Standalone_PerformanceTests_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_playmode_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_playmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_playmode_PerformanceTests_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_editmode_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_editmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_editmode_PerformanceTests_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VFX_URP_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_URP on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-osx-openglcore.yml b/.yamato/vfx_urp-osx-openglcore.yml index adef2185766..d35dd0c512c 100644 --- a/.yamato/vfx_urp-osx-openglcore.yml +++ b/.yamato/vfx_urp-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -207,204 +206,6 @@ VFX_URP_OSX_OpenGLCore_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneOSX --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision - - path: .yamato/vfx_urp-osx-openglcore.yml#Build_VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_2021.2: - name: Build VFX_URP on OSX_OpenGLCore_mono_Linear_Standalone_PerformanceTests_build_Player on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneOSX --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_CUSTOM-REVISION: name: VFX_URP on OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-win-dx11.yml b/.yamato/vfx_urp-win-dx11.yml index 1f49f4fd7db..968c4723087 100644 --- a/.yamato/vfx_urp-win-dx11.yml +++ b/.yamato/vfx_urp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -284,281 +283,6 @@ VFX_URP_Win_DX11_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VFX_URP_Win_DX11_Standalone_mono_Linear_2021.2: - name: VFX_URP on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/Viking-Village-Perf --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_BuiltIn_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter="MemoryAllocation;RuntimeProfilerMetrics" --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_BuiltIn_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Build --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VikingVillage_BuiltIn_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_BuiltIn on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_builtin-osx-metal.yml b/.yamato/vikingvillage_builtin-osx-metal.yml index 4084f3fd49c..20cf2cc53a8 100644 --- a/.yamato/vikingvillage_builtin-osx-metal.yml +++ b/.yamato/vikingvillage_builtin-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -201,198 +200,6 @@ VikingVillage_BuiltIn_OSX_Metal_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VikingVillage_BuiltIn_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_BuiltIn_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter="MemoryAllocation;RuntimeProfilerMetrics" --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_BuiltIn_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Build --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VikingVillage_BuiltIn_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_BuiltIn on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_builtin-win-dx11.yml b/.yamato/vikingvillage_builtin-win-dx11.yml index f63d086284c..7130b8a6310 100644 --- a/.yamato/vikingvillage_builtin-win-dx11.yml +++ b/.yamato/vikingvillage_builtin-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -219,216 +218,6 @@ VikingVillage_BuiltIn_Win_DX11_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VikingVillage_BuiltIn_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersMedium --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/Viking-Village-Perf --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_URP_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_URP on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_URP_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_URP on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VikingVillage_URP_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_URP on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_urp-osx-metal.yml b/.yamato/vikingvillage_urp-osx-metal.yml index bcf55c51606..a5bb3f05693 100644 --- a/.yamato/vikingvillage_urp-osx-metal.yml +++ b/.yamato/vikingvillage_urp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -201,198 +200,6 @@ VikingVillage_URP_OSX_Metal_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VikingVillage_URP_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_URP on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_URP_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_URP on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_URP_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_URP on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - 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: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VikingVillage_URP_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_URP on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_urp-win-dx11.yml b/.yamato/vikingvillage_urp-win-dx11.yml index 05247f1d8a9..d3cb59ffc03 100644 --- a/.yamato/vikingvillage_urp-win-dx11.yml +++ b/.yamato/vikingvillage_urp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -219,216 +218,6 @@ VikingVillage_URP_Win_DX11_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VikingVillage_URP_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_URP on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= Date: Wed, 1 Sep 2021 11:15:31 +0200 Subject: [PATCH 002/149] Bump to version 13.0.0 (2022.1) (#5488) * Bump to version 13.0.0 (2022.1) * bump missing version --- Tools/CreateLocalPackages.cmd | 2 +- com.unity.render-pipelines.core/CHANGELOG.md | 5 +++++ .../ShaderLibrary/Version.hlsl | 2 +- com.unity.render-pipelines.core/package.json | 6 +++--- .../CHANGELOG.md | 5 +++++ .../package.json | 8 ++++---- .../CHANGELOG.md | 5 +++++ .../package.json | 14 +++++++------- com.unity.render-pipelines.universal/CHANGELOG.md | 5 +++++ .../ValidationExceptions.json | 4 ++-- com.unity.render-pipelines.universal/package.json | 10 +++++----- com.unity.shadergraph/CHANGELOG.md | 5 +++++ com.unity.shadergraph/package.json | 8 ++++---- .../Packages/com.unity.template.hd/CHANGELOG.md | 5 +++++ .../Packages/com.unity.template.hd/package.json | 6 +++--- com.unity.template-hd/Packages/manifest.json | 2 +- .../com.unity.template.universal/CHANGELOG.md | 5 +++++ .../com.unity.template.universal/package.json | 6 +++--- .../Packages/manifest.json | 2 +- .../package.json | 6 +++--- com.unity.testing.visualeffectgraph/package.json | 8 ++++---- com.unity.visualeffectgraph/CHANGELOG.md | 5 +++++ com.unity.visualeffectgraph/package.json | 10 +++++----- 23 files changed, 87 insertions(+), 47 deletions(-) diff --git a/Tools/CreateLocalPackages.cmd b/Tools/CreateLocalPackages.cmd index 672fc1f23f2..480434560c7 100644 --- a/Tools/CreateLocalPackages.cmd +++ b/Tools/CreateLocalPackages.cmd @@ -1,4 +1,4 @@ -set version=12.0.0 +set version=13.0.0 call CreateOneLocalPackage.bat com.unity.render-pipelines.core %version% call CreateOneLocalPackage.bat com.unity.render-pipelines.high-definition %version% call CreateOneLocalPackage.bat com.unity.render-pipelines.high-definition-config %version% diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 7d1f61d7290..8bcffaba438 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl index 0178aa7649c..a2dd246db81 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl @@ -1,7 +1,7 @@ // The old version number system below is deprecated whith Graphic Packages that have move as core package of Unity. // User should rely on the Macro UNITY_VERSION now to detect which version of Unity is coupled to the current set of pipeline shader // Example of usage #if UNITY_VERSION >= 202120 to check if the version is above or equal 2021.2 -#define SHADER_LIBRARY_VERSION_MAJOR 12 +#define SHADER_LIBRARY_VERSION_MAJOR 13 #define SHADER_LIBRARY_VERSION_MINOR 0 #define VERSION_GREATER_EQUAL(major, minor) ((SHADER_LIBRARY_VERSION_MAJOR > major) || ((SHADER_LIBRARY_VERSION_MAJOR == major) && (SHADER_LIBRARY_VERSION_MINOR >= minor))) diff --git a/com.unity.render-pipelines.core/package.json b/com.unity.render-pipelines.core/package.json index bd88ad7f344..69dc8316ebf 100644 --- a/com.unity.render-pipelines.core/package.json +++ b/com.unity.render-pipelines.core/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.render-pipelines.core", "description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "displayName": "Core RP Library", "dependencies": { "com.unity.ugui": "1.0.0", diff --git a/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/com.unity.render-pipelines.high-definition-config/CHANGELOG.md index a3861919b4f..51e98183c06 100644 --- a/com.unity.render-pipelines.high-definition-config/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition-config/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 Version Updated diff --git a/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.render-pipelines.high-definition-config/package.json index d91a6f73878..f06179393f1 100644 --- a/com.unity.render-pipelines.high-definition-config/package.json +++ b/com.unity.render-pipelines.high-definition-config/package.json @@ -1,11 +1,11 @@ { "name": "com.unity.render-pipelines.high-definition-config", "description": "Configuration files for the High Definition Render Pipeline.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "displayName": "High Definition RP Config", "dependencies": { - "com.unity.render-pipelines.core": "12.0.0" + "com.unity.render-pipelines.core": "13.0.0" } } diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 075b572d7d4..5ffafcca840 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.render-pipelines.high-definition/package.json b/com.unity.render-pipelines.high-definition/package.json index 536f4ce43e5..71a150b420d 100644 --- a/com.unity.render-pipelines.high-definition/package.json +++ b/com.unity.render-pipelines.high-definition/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.render-pipelines.high-definition", "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": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "displayName": "High Definition RP", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -12,10 +12,10 @@ "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.render-pipelines.core": "12.0.0", - "com.unity.shadergraph": "12.0.0", - "com.unity.visualeffectgraph": "12.0.0", - "com.unity.render-pipelines.high-definition-config": "12.0.0" + "com.unity.render-pipelines.core": "13.0.0", + "com.unity.shadergraph": "13.0.0", + "com.unity.visualeffectgraph": "13.0.0", + "com.unity.render-pipelines.high-definition-config": "13.0.0" }, "keywords": [ "graphics", diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index a5c024c64a9..c4427062974 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added - Added support for default sprite mask shaders for the 2D Renderer in URP. diff --git a/com.unity.render-pipelines.universal/ValidationExceptions.json b/com.unity.render-pipelines.universal/ValidationExceptions.json index 7a57fa6593f..5a682cbca67 100644 --- a/com.unity.render-pipelines.universal/ValidationExceptions.json +++ b/com.unity.render-pipelines.universal/ValidationExceptions.json @@ -3,8 +3,8 @@ [ { "ValidationTest": "Package Lifecycle Validation", - "ExceptionError": "Package com.unity.render-pipelines.universal@12.0.0 depends on package com.unity.burst@1.5.0 which is in an invalid track for release purposes. Release versions can only depend on Release versions.", - "PackageVersion": "12.0.0" + "ExceptionError": "Package com.unity.render-pipelines.universal@13.0.0 depends on package com.unity.burst@1.5.0 which is in an invalid track for release purposes. Release versions can only depend on Release versions.", + "PackageVersion": "13.0.0" } ] } diff --git a/com.unity.render-pipelines.universal/package.json b/com.unity.render-pipelines.universal/package.json index 0ff8bf5f56b..5a33e0b2ad3 100644 --- a/com.unity.render-pipelines.universal/package.json +++ b/com.unity.render-pipelines.universal/package.json @@ -1,15 +1,15 @@ { "name": "com.unity.render-pipelines.universal", "description": "The Universal Render Pipeline (URP) is a prebuilt Scriptable Render Pipeline, made by Unity. URP provides artist-friendly workflows that let you quickly and easily create optimized graphics across a range of platforms, from mobile to high-end consoles and PCs.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "displayName": "Universal RP", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "12.0.0", - "com.unity.shadergraph": "12.0.0" + "com.unity.render-pipelines.core": "13.0.0", + "com.unity.shadergraph": "13.0.0" }, "keywords": [ "graphics", diff --git a/com.unity.shadergraph/CHANGELOG.md b/com.unity.shadergraph/CHANGELOG.md index 87586735410..c141fa793ca 100644 --- a/com.unity.shadergraph/CHANGELOG.md +++ b/com.unity.shadergraph/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package are documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.shadergraph/package.json b/com.unity.shadergraph/package.json index 6095beeaaf5..cfcc87f5cec 100644 --- a/com.unity.shadergraph/package.json +++ b/com.unity.shadergraph/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.shadergraph", "description": "The Shader Graph package adds a visual Shader editing tool to Unity. You can use this tool to create Shaders in a visual way instead of writing code. Specific render pipelines can implement specific graph features. Currently, both the High Definition Rendering Pipeline and the Universal Rendering Pipeline support Shader Graph.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "displayName": "Shader Graph", "dependencies": { - "com.unity.render-pipelines.core": "12.0.0", + "com.unity.render-pipelines.core": "13.0.0", "com.unity.searcher": "4.8.0" }, "samples": [ diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md index 54a1a40d91c..0aac69488f2 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md +++ b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +### Changed +- Update SRP package to 13.0.0 + ## [12.2.0] - 2021-08-25 ### Changed diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/package.json b/com.unity.template-hd/Packages/com.unity.template.hd/package.json index f27df950969..a894ab8c204 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/package.json +++ b/com.unity.template-hd/Packages/com.unity.template.hd/package.json @@ -1,15 +1,15 @@ { "name": "com.unity.template.hd", "displayName": "High Definition RP", - "version": "12.2.0", + "version": "13.0.0", "type": "template", "host": "hub", - "unity": "2021.2", + "unity": "2022.1", "description": "This template utilizes the High Definition Render Pipeline. Making it a good starting point for people focused on high-end graphics that want to develop games for platforms that support Shader Model 5.0 (DX11 and above). \n\nBeyond being tuned for High End visuals this project includes\n\u25aa Shadergraph \n\u25aa Visual Effect Graph \n\u25aa Presets \n\u25aa Example content", "dependencies": { "com.unity.cinemachine": "2.8.0", "com.unity.inputsystem": "1.1.0-pre.5", "com.unity.learn.iet-framework": "2.0.0", - "com.unity.render-pipelines.high-definition": "12.0.0" + "com.unity.render-pipelines.high-definition": "13.0.0" } } diff --git a/com.unity.template-hd/Packages/manifest.json b/com.unity.template-hd/Packages/manifest.json index 6c2263a3526..89589dd0cee 100644 --- a/com.unity.template-hd/Packages/manifest.json +++ b/com.unity.template-hd/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.1.0-pre.5", "com.unity.learn.iet-framework": "2.0.0", - "com.unity.render-pipelines.high-definition": "12.0.0", + "com.unity.render-pipelines.high-definition": "13.0.0", "com.unity.learn.iet-framework.authoring": "1.0.0", "com.unity.timeline": "1.6.1", "com.unity.ugui": "1.0.0", diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md index d768f57de06..2d5ce6d109d 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md +++ b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +### Changed +- Update SRP package to 13.0.0 + ## [12.1.0] - 2021-07-28 Version Updated diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/package.json b/com.unity.template-universal/Packages/com.unity.template.universal/package.json index 58d2ef06e85..a231e9cc0e7 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/package.json +++ b/com.unity.template-universal/Packages/com.unity.template.universal/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.template.universal", "displayName": "Universal Render Pipeline", - "version": "12.1.0", + "version": "13.0.0", "type": "template", - "unity": "2021.2", + "unity": "2022.1", "host": "hub", "description": "The Universal Render Pipeline Template configures Project settings for Projects where performance, wide platform support, and ease of customizing graphics are the primary considerations.\n\nThis Template uses the Universal Render Pipeline (URP) and Shader Graph. URP is prebuilt Scriptable Render Pipeline that is quick and easy to customize, and lets you create optimized graphics across a wide range of platforms. URP also includes an optimized 2D renderer complete with 2D lights and pixel perfect rendering, and an integrated post-processing solution. Shader Graph is a tool that allows you to create shaders using a visual node editor instead of writing code.\n\nThis template contains a sample Scene that contains examples of how to configure lighting settings, Materials, Shaders, and post-processing effects in URP, several preconfigured Universal Render Pipeline Assets that let you quickly swap between graphics quality levels, and Presets that have been optimized for use with URP.", "dependencies": { - "com.unity.render-pipelines.universal": "12.0.0" + "com.unity.render-pipelines.universal": "13.0.0" } } \ No newline at end of file diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index 7aef4d0c9e9..181428325b1 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.ide.visualstudio": "2.0.0", "com.unity.ide.vscode": "1.1.4", "com.unity.purchasing": "2.0.6", - "com.unity.render-pipelines.universal": "12.0.0", + "com.unity.render-pipelines.universal": "13.0.0", "com.unity.test-framework": "1.1.18", "com.unity.textmeshpro": "3.0.0-preview.4", "com.unity.timeline": "1.2.11", diff --git a/com.unity.testing.graphics-performance/package.json b/com.unity.testing.graphics-performance/package.json index 991c34e89e8..f2444778242 100644 --- a/com.unity.testing.graphics-performance/package.json +++ b/com.unity.testing.graphics-performance/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.testing.graphics-performance", "displayName":"Performance Graphics Tests Framework", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0a1", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "description": "Provides performance framework helpers for writing tests for graphics code, such as test scene asset description, performance performance report and shader static analysis.", "keywords": ["qa", "test", "testing", "tests", "graphics", "performance"], "dependencies": { diff --git a/com.unity.testing.visualeffectgraph/package.json b/com.unity.testing.visualeffectgraph/package.json index b4121122f3d..54f4b8657a7 100644 --- a/com.unity.testing.visualeffectgraph/package.json +++ b/com.unity.testing.visualeffectgraph/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.testing.visualeffectgraph", "displayName": "Visual Effect Graphic Tests", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0a1", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "description": "This package contains common graphics tests from several scriptable renderpipeline", "dependencies": { - "com.unity.visualeffectgraph": "12.0.0", + "com.unity.visualeffectgraph": "13.0.0", "com.unity.testframework.graphics": "7.8.11-preview", "com.unity.testing.graphics-performance": "8.0.0", "com.unity.test-framework": "1.1.18" diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md index 0607caeafe6..9ed08f5929e 100644 --- a/com.unity.visualeffectgraph/CHANGELOG.md +++ b/com.unity.visualeffectgraph/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added - Added support for Texture2D Arrays in Flipbooks diff --git a/com.unity.visualeffectgraph/package.json b/com.unity.visualeffectgraph/package.json index b1faa400e48..bcd77892ffd 100644 --- a/com.unity.visualeffectgraph/package.json +++ b/com.unity.visualeffectgraph/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.visualeffectgraph", "displayName": "Visual Effect Graph", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.", "keywords": [ "vfx", @@ -13,8 +13,8 @@ "particles" ], "dependencies": { - "com.unity.shadergraph": "12.0.0", - "com.unity.render-pipelines.core": "12.0.0" + "com.unity.shadergraph": "13.0.0", + "com.unity.render-pipelines.core": "13.0.0" }, "samples": [ { From bd2ee07d9c06245a6aa3b65baff7e729465aa872 Mon Sep 17 00:00:00 2001 From: Dieter De Baets Date: Wed, 1 Sep 2021 11:43:55 +0200 Subject: [PATCH 003/149] updated macos reference images for VT tests (inline sampler with aniso has issues on Metal) (#5498) Co-authored-by: Dieter De Baets --- .../OSXPlayer/Metal/None/003-VirtualTexturing-Forward.png | 4 ++-- .../Metal/None/003-VirtualTexturing-NoMV-Forward.png | 4 ++-- .../Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV.png | 4 ++-- .../Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-Forward.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-Forward.png index fec707b662c..af2ef7810e8 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-Forward.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-Forward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb13c2bc4158e15256780860724623b96b5d6714e512031c101d515d9da1e3ab -size 579956 +oid sha256:20577dae7ac82ba91499a98c24a10f4d361d57f3bf2fe8f5fccda0e063ff7f50 +size 570670 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV-Forward.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV-Forward.png index 25cbaa5da29..c88b440425a 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV-Forward.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV-Forward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:617456f53fb11dbbf59f7425143b485da369e5deb5a09e440e7e37faa54c01f3 -size 579984 +oid sha256:a430c152f1b000ba0a82962ada3410e3102e9c7192d329cf5d32c6d03ac57632 +size 570892 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV.png index ba390cdc69b..70fc618d3bf 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing-NoMV.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39fa0934a0ba2aa12e367e1ad615cd4e2e631f4bf97b9debd6e1c249c00d1da -size 575133 +oid sha256:db5308976f22b25d3ec41a7cd3e88fe3bb961bfc3a2fbdd3a4f465d83a452518 +size 563810 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png index 1b3cb47bd92..0fb0614bc01 100644 --- a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41ff5a4a3e681b7c5bd18b601d3aff6bf46c3f78d25261b38998a7b0dc0341a7 -size 558254 +oid sha256:b91d75ec273593266e608bf2d8ed5493c7ec9d75a6b00a884f0e8b06a372fdf2 +size 548374 From 8b10aea4d588a3d733490f270a362b838a618f1e Mon Sep 17 00:00:00 2001 From: Antoine Lelievre Date: Wed, 1 Sep 2021 11:46:43 +0200 Subject: [PATCH 004/149] [HDRP] Fix camera not loosing focus when pressing [esc] (#5489) * Fixed impossibility to release the cursor in the template. * Updated changelog --- .../CHANGELOG.md | 1 + .../Scripts/LookWithMouse.cs | 31 ++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 5ffafcca840..3a79de186f0 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -382,6 +382,7 @@ The version number for this package has increased due to a version update of a r - Fixed case where the SceneView don't refresh when using LightExplorer with a running and Paused game (1354129) - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) - Allow negative wind speed parameter. +- Fixed impossibility to release the cursor in the template. ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs b/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs index 2aabbd014f9..f5cde4a4a14 100644 --- a/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs +++ b/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs @@ -20,11 +20,14 @@ public class LookWithMouse : MonoBehaviour void Start() { Cursor.lockState = CursorLockMode.Locked; + Cursor.visible = false; } // Update is called once per frame void Update() { + bool unlockPressed, lockPressed; + #if ENABLE_INPUT_SYSTEM float mouseX = 0, mouseY = 0; @@ -41,18 +44,38 @@ void Update() mouseY += value.y; } + unlockPressed = Keyboard.current.escapeKey.wasPressedThisFrame; + lockPressed = Mouse.current.leftButton.wasPressedThisFrame || Mouse.current.rightButton.wasPressedThisFrame; + mouseX *= mouseSensitivity * k_MouseSensitivityMultiplier; mouseY *= mouseSensitivity * k_MouseSensitivityMultiplier; #else float mouseX = Input.GetAxis("Mouse X") * mouseSensitivity * k_MouseSensitivityMultiplier; float mouseY = Input.GetAxis("Mouse Y") * mouseSensitivity * k_MouseSensitivityMultiplier; + + unlockPressed = Input.GetKeyDown(KeyCode.Escape); + lockPressed = Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1); #endif - xRotation -= mouseY; - xRotation = Mathf.Clamp(xRotation, -90f, 90f); + if (unlockPressed) + { + Cursor.lockState = CursorLockMode.None; + Cursor.visible = true; + } + if (lockPressed) + { + Cursor.lockState = CursorLockMode.Locked; + Cursor.visible = false; + } + + if (Cursor.lockState == CursorLockMode.Locked) + { + xRotation -= mouseY; + xRotation = Mathf.Clamp(xRotation, -90f, 90f); - transform.localRotation = Quaternion.Euler(xRotation, 0f, 0f); + transform.localRotation = Quaternion.Euler(xRotation, 0f, 0f); - playerBody.Rotate(Vector3.up * mouseX); + playerBody.Rotate(Vector3.up * mouseX); + } } } From 6114eae1c0289887ee2be1fd4ab462adb88bb9c6 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Wed, 1 Sep 2021 11:52:22 +0200 Subject: [PATCH 005/149] Remove old pv stuff (#5479) --- .../ShaderLibrary/ShaderVariablesGlobal.cs | 17 +---------------- .../ShaderLibrary/ShaderVariablesGlobal.cs.hlsl | 10 +--------- 2 files changed, 2 insertions(+), 25 deletions(-) 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 e9157762458..e8be82747d1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs @@ -218,7 +218,7 @@ unsafe struct ShaderVariablesGlobal public uint _NumTileClusteredX; public uint _NumTileClusteredY; public int _EnvSliceSize; - public float _Pad7; + public uint _EnableDecalLayers; // Subsurface scattering // Use float4 to avoid any packing issue between compute and pixel shaders @@ -256,25 +256,10 @@ unsafe struct ShaderVariablesGlobal public int _RaytracingFrameIndex; // Index of the current frame [0, 7] public uint _EnableRecursiveRayTracing; - // Probe Volumes - public Vector4 _ProbeVolumeAtlasResolutionAndSliceCount; - public Vector4 _ProbeVolumeAtlasResolutionAndSliceCountInverse; - public Vector4 _ProbeVolumeAtlasOctahedralDepthResolutionAndInverse; - - public int _ProbeVolumeLeakMitigationMode; - public float _ProbeVolumeBilateralFilterWeightMin; - public float _ProbeVolumeBilateralFilterWeight; - public uint _EnableDecalLayers; - - [HLSLArray(7, typeof(Vector4))] - public fixed float _ProbeVolumeAmbientProbeFallbackPackedCoeffs[7 * 4]; // 3 bands of SH, packed for storing global ambient probe lighting as fallback to probe volumes. - public int _TransparentCameraOnlyMotionVectors; - // Can be set to 0 to globally "disable" tessellation // Because the DepthPrepass doesn't have a DEBUG_DISPLAY variant, it is the only way to disable it for debug modes public float _GlobalTessellationFactorMultiplier; - public float _SpecularOcclusionBlend; public float _DeExposureMultiplier; } 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 3318ae78698..024ad9e0136 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 @@ -124,7 +124,7 @@ GLOBAL_CBUFFER_START(ShaderVariablesGlobal, b0) uint _NumTileClusteredX; uint _NumTileClusteredY; int _EnvSliceSize; - float _Pad7; + uint _EnableDecalLayers; float4 _ShapeParamsAndMaxScatterDists[16]; float4 _TransmissionTintsAndFresnel0[16]; float4 _WorldScalesAndFilterRadiiAndThicknessRemaps[16]; @@ -145,14 +145,6 @@ GLOBAL_CBUFFER_START(ShaderVariablesGlobal, b0) int _EnableRayTracedReflections; int _RaytracingFrameIndex; uint _EnableRecursiveRayTracing; - float4 _ProbeVolumeAtlasResolutionAndSliceCount; - float4 _ProbeVolumeAtlasResolutionAndSliceCountInverse; - float4 _ProbeVolumeAtlasOctahedralDepthResolutionAndInverse; - int _ProbeVolumeLeakMitigationMode; - float _ProbeVolumeBilateralFilterWeightMin; - float _ProbeVolumeBilateralFilterWeight; - uint _EnableDecalLayers; - float4 _ProbeVolumeAmbientProbeFallbackPackedCoeffs[7]; int _TransparentCameraOnlyMotionVectors; float _GlobalTessellationFactorMultiplier; float _SpecularOcclusionBlend; From 6158733a4cc85d753bfbe54a7bbc8e0cda6161ba Mon Sep 17 00:00:00 2001 From: Adrien de Tocqueville Date: Wed, 1 Sep 2021 11:59:13 +0200 Subject: [PATCH 006/149] Merge shape offset parameters (#5469) Co-authored-by: sebastienlagarde --- .../VolumetricCloudsEditor.cs | 18 ++++-------------- .../HDRenderPipeline.VolumetricClouds.cs | 4 ++-- .../VolumetricClouds.Migration.cs | 16 ++++++++++++++++ .../VolumetricLighting/VolumetricClouds.cs | 18 +++--------------- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs index f8de3f5cd4d..9c7114e3115 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs @@ -46,9 +46,7 @@ class VolumetricCloudsEditor : VolumeComponentEditor SerializedDataParameter m_DensityMultiplier; SerializedDataParameter m_ShapeFactor; SerializedDataParameter m_ShapeScale; - SerializedDataParameter m_ShapeOffsetX; - SerializedDataParameter m_ShapeOffsetY; - SerializedDataParameter m_ShapeOffsetZ; + SerializedDataParameter m_ShapeOffset; SerializedDataParameter m_ErosionFactor; SerializedDataParameter m_ErosionScale; SerializedDataParameter m_ErosionNoiseType; @@ -126,9 +124,7 @@ public override void OnEnable() m_DensityMultiplier = Unpack(o.Find(x => x.densityMultiplier)); m_ShapeFactor = Unpack(o.Find(x => x.shapeFactor)); m_ShapeScale = Unpack(o.Find(x => x.shapeScale)); - m_ShapeOffsetX = Unpack(o.Find(x => x.shapeOffsetX)); - m_ShapeOffsetY = Unpack(o.Find(x => x.shapeOffsetY)); - m_ShapeOffsetZ = Unpack(o.Find(x => x.shapeOffsetZ)); + m_ShapeOffset = Unpack(o.Find(x => x.shapeOffset)); m_ErosionFactor = Unpack(o.Find(x => x.erosionFactor)); m_ErosionScale = Unpack(o.Find(x => x.erosionScale)); m_ErosionNoiseType = Unpack(o.Find(x => x.erosionNoiseType)); @@ -234,9 +230,7 @@ public override void OnInspectorGUI() } PropertyField(m_ShapeFactor); PropertyField(m_ShapeScale); - PropertyField(m_ShapeOffsetX); - PropertyField(m_ShapeOffsetY); - PropertyField(m_ShapeOffsetZ); + PropertyField(m_ShapeOffset); PropertyField(m_ErosionFactor); PropertyField(m_ErosionScale); PropertyField(m_ErosionNoiseType); @@ -248,11 +242,7 @@ public override void OnInspectorGUI() } } else - { - PropertyField(m_ShapeOffsetX); - PropertyField(m_ShapeOffsetY); - PropertyField(m_ShapeOffsetZ); - } + PropertyField(m_ShapeOffset); } PropertyField(m_EarthCurvature); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs index ef1175bb30d..73f366b80f3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs @@ -439,8 +439,8 @@ void UpdateShaderVariableslClouds(ref ShaderVariablesClouds cb, HDCamera hdCamer cb._ShapeScale = cloudModelData.shapeScale; cb._ErosionFactor = cloudModelData.erosionFactor; cb._ErosionScale = cloudModelData.erosionScale; - cb._ShapeNoiseOffset = new Vector2(settings.shapeOffsetX.value, settings.shapeOffsetZ.value); - cb._VerticalShapeNoiseOffset = settings.shapeOffsetY.value; + cb._ShapeNoiseOffset = new Vector2(settings.shapeOffset.value.x, settings.shapeOffset.value.z); + cb._VerticalShapeNoiseOffset = settings.shapeOffset.value.y; // If the sun has moved more than 2.0°, reduce significantly the history accumulation float sunAngleDifference = 0.0f; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs index 04ccc55904c..df58db1052f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs @@ -23,6 +23,7 @@ enum Version { Initial, GlobalWind, + ShapeOffset, Count } @@ -44,6 +45,13 @@ enum Version mode = WindParameter.WindOverrideMode.Custom, customValue = c.m_ObsoleteOrientation.value }; +#pragma warning restore 618 + }), + MigrationStep.New(Version.ShapeOffset, (VolumetricClouds c) => + { +#pragma warning disable 618 // Type or member is obsolete + c.shapeOffset.overrideState = c.m_ObsoleteShapeOffsetX.overrideState || c.m_ObsoleteShapeOffsetY.overrideState || c.m_ObsoleteShapeOffsetZ.overrideState; + c.shapeOffset.value = new Vector3(c.m_ObsoleteShapeOffsetX.value, c.m_ObsoleteShapeOffsetY.value, c.m_ObsoleteShapeOffsetZ.value); #pragma warning restore 618 }) ); @@ -61,5 +69,13 @@ void Awake() MinFloatParameter m_ObsoleteWindSpeed = new MinFloatParameter(1.0f, 0.0f); [SerializeField, FormerlySerializedAs("orientation"), Obsolete("For Data Migration")] ClampedFloatParameter m_ObsoleteOrientation = new ClampedFloatParameter(0.0f, 0.0f, 360.0f); + + [SerializeField, FormerlySerializedAs("shapeOffsetX"), Obsolete("For Data Migration")] + FloatParameter m_ObsoleteShapeOffsetX = new FloatParameter(0.0f); + [SerializeField, FormerlySerializedAs("shapeOffsetY"), Obsolete("For Data Migration")] + FloatParameter m_ObsoleteShapeOffsetY = new FloatParameter(0.0f); + [SerializeField, FormerlySerializedAs("shapeOffsetZ"), Obsolete("For Data Migration")] + FloatParameter m_ObsoleteShapeOffsetZ = new FloatParameter(0.0f); + } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs index 14a00161465..57d1a1acbdd 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs @@ -379,22 +379,10 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals public MinFloatParameter shapeScale = new MinFloatParameter(2.5f, 0.1f); /// - /// Controls the offset (world X-axis) applied when evaluating the larger noise passing through the cloud coverage. + /// Controls the world space offset applied when evaluating the larger noise passing through the cloud coverage. /// - [Tooltip("Controls the offset (world X-axis) applied when evaluating the larger noise passing through the cloud coverage.")] - public FloatParameter shapeOffsetX = new FloatParameter(0.0f); - - /// - /// Controls the offset (world Y-axis) applied when evaluating the larger noise passing through the cloud coverage. - /// - [Tooltip("Controls the offset (world Y-axis) applied when evaluating the larger noise passing through the cloud coverage.")] - public FloatParameter shapeOffsetY = new FloatParameter(0.0f); - - /// - /// Controls the offset (world Z-axis) applied when evaluating the larger noise passing through the cloud coverage. - /// - [Tooltip("Controls the offset (world Z-axis) applied when evaluating the larger noise passing through the cloud coverage.")] - public FloatParameter shapeOffsetZ = new FloatParameter(0.0f); + [Tooltip("Controls the world space offset applied when evaluating the larger noise passing through the cloud coverage.")] + public Vector3Parameter shapeOffset = new Vector3Parameter(Vector3.zero); /// /// Controls the smaller noise on the edge of the clouds. A higher value will erode clouds more significantly. From ab066314a5b16898c2c3122ced03584ae52a19a1 Mon Sep 17 00:00:00 2001 From: JulienIgnace-Unity Date: Wed, 1 Sep 2021 12:14:58 +0200 Subject: [PATCH 007/149] Changed Ambient Mode to Dynamic by default (#5465) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [HDRP] Fix AxF debug output in certain configurations (#4641) * Fix AxF debug output in certain configurations. * Update comment * Fix SSR accumulation white flash (#4648) * Fix white flash * changelog Co-authored-by: sebastienlagarde * Display Info Box when MSAA + ray tracing is onr (#4627) * Show info box when ray tracing is enabled. * Changelog * Move below MSAA Co-authored-by: sebastienlagarde * Fix distortion when resizing the window in player builds with the Graphics Compositor enabled (#4593) Co-authored-by: sebastienlagarde * Add support for the camera bridge in the graphics compositor (#4599) * Fix Jittered Project Matrix Infinite Far Clip Plane (#4638) * Reconstruct jittered projection matrix far plane (for Infinite ) * Changelog Co-authored-by: sebastienlagarde * Fixed a memory leak related to not disposing of the RTAS at the end HDRP's lifecycle. (#4688) Co-authored-by: sebastienlagarde * Fix custom pass utils Blur + Copy overdraw. (#4623) * Fix overdraw in custom pass utils blur function * Updated changelog Co-authored-by: sebastienlagarde * Fix draw procedural invalid pass idx 1 on first template load (#4632) * Fix * changelog * Force sync compilation for TAA Co-authored-by: CifaCia Co-authored-by: sebastienlagarde * Changed light reset to preserve type (#4624) Co-authored-by: sebastienlagarde * Revert "Add support for the camera bridge in the graphics compositor (#4599)" This reverts commit 2325e3fbbcc36a5843af8363234c1a304afd826f. * AxF carpaint: Fix a compilation issue on Vulkan until the cpp HLSLcc side is updated. (case 1335737, related to 1314040) (#4691) Co-authored-by: sebastienlagarde * Revert "Revert "Add support for the camera bridge in the graphics compositor (#4599)"" This reverts commit 30fffd5f7b47ff4e238ba84ee87cafbffc23581a. * revert: Fix distortion when resizing the window in player builds with the Graphi * Fixed the ray traced sub subsurface scattering debug mode not displaying only the RTSSS Data (case 1332904). (#4626) * Fixed the ray traced sub subsurface scattering debug mode not displaying only the RTSSS Data (case 1332904). * Add test scene Co-authored-by: Remi Chapelain Co-authored-by: Sebastien Lagarde * Fix for discrepancies in saturation and intensity between screen space refraction and probe refraction (#4653) * Delete the second transmittance mul * Changelog Co-authored-by: Sebastien Lagarde * Fix a Divide-by-Zero Warning for some Anisotropic Models (Fabric, Lit) (#4636) * Initialize the shading normal to a non-zero value for anisotropy * Changelog Co-authored-by: sebastienlagarde * [HDRP] Fix VfX lit particle AOV output color space (#4646) * Fix VfX lit particle aov output color space * Update comment Co-authored-by: sebastienlagarde * [HDRP][Path Tracing] Fixed transparent unlit (#4605) * Fixed issue with transparent unlit. * Updated changelog. * Reverted accidental change to default mtl. Co-authored-by: sebastienlagarde * Fix distortion with MSAA (#4711) * Fix contact shadow debug views (#4720) * Fix * changelog Co-authored-by: sebastienlagarde * Update Decal-Projector.md (#4695) * [HDRP] Fixed nullref when deleting the texture asset assigned in a local volumetric fog volume (#4728) * Fixed nullref when deleting the 3D mask of a density volume (case 1339330) * Updated changelog Co-authored-by: sebastienlagarde * Fix decal layer enum (#4753) * Fix typo * Fixed reflection probes being injected into the ray tracing light cluster even if not baked (case 1329083). (#4640) Co-authored-by: sebastienlagarde * Ignore hybrid duplicated reflection probes during light baking (#4663) * Ignore hybrid duplicated reflection probes during light baking * test path instead of scene Co-authored-by: sebastienlagarde * Fix double sided option moving when toggling it in the material UI (#4725) * Fix double sided option moving when toggling it in the material UI (case 1328877) * Updated changelog Co-authored-by: sebastienlagarde * Fix formatting * Fix volumetric fog in planar reflections (#4736) * Fix planar reflection * changelog Co-authored-by: sebastienlagarde * Fix motion blur compute dispatch size (#4737) Co-authored-by: sebastienlagarde * - Updated the recursive rendering documentation (case 1338639). (#4759) * - Updated the recursive rendering documentation (case 1338639). * review fixes Co-authored-by: sebastienlagarde * Fix issue with OnDemand directional shadow map being corrupted when reflection probe are updated same frame (#4812) * Don't mark as rendered for reflection probes as we want the cached version to be from main view * Do the thing just for directional * Doc update * changelog Co-authored-by: sebastienlagarde * Fix cropping issue with the compositor camera bridge (#4802) Co-authored-by: sebastienlagarde * Fix for unused resources in depth of field (#4796) * Removing the word Radii from exposure settings (#4854) * Rename in UX * Update docs * [HDRP][Path Tracing] Support for shadow mattes (#4745) * Shadow matte support. * Updated changelog. * Only take occluders into account, closer match to raster mode. * Added test scene. Co-authored-by: sebastienlagarde * Revert "[HDRP][Path Tracing] Support for shadow mattes (#4745)" This reverts commit 85ebbc24ba3ad33926dc5fca2dae7a0d8dde4e2d. * Fixed the transparent cutoff not working properly in semi-transparent and color shadows (case 1340234). (#4756) * Fixed the transparent cutoff not working properly in semi-transparent and color shadows (case 1340234). * Update test ref image Co-authored-by: Remi Chapelain Co-authored-by: sebastienlagarde * Use non jittered projection in outline pass (#4836) Co-authored-by: sebastienlagarde * [HDRP][Path Tracing] Sky settings now properly taken into account when using recorder (#4856) * Make sure sky settings are correctly set when recording. * Updated changelog. Co-authored-by: sebastienlagarde * Fix Resolution Issues for Physically Based Depth of Field (#4848) * Add the necesarry texture coordinate clamping for RTHandle for color pyramid sampling * Add some resolution independence, fitted for 1920x1080 * Changelog * Switch back to point sampling from trilinear, with commentary * Update test reference images * Small correction to the point sampling, always sample mip 0. * Re-update the test images, for mip 0 color sampling * Use a simpler UV scaling/clamping since we are now point sampling. Co-authored-by: sebastienlagarde * Fixed bug introduced by sky-for-recorder support. (#4906) * [Fogbugz 1341576] Memory leaks when the player is paused, and the user changes pipeline… (#4845) * Memory leaks when the player is paused, and the user changes pipeline settings * changelog * [HDRP] Fixed shadergraph double save (#4916) * Don't need to save twice shadergraph the first time we create a graph * Updated changelog * Write 0 instead of micro sized motion vectors + fix extremely fast velocities (#4820) * Kill micromovements. * Do same for camera * Debug view update * Changelog * Remove unnecessary comment * Fix excessive velocity end up marked as no velocity Co-authored-by: sebastienlagarde * [HDRP] Fix material upgrader (#4821) * Fix HDRP material upgrade failing when there is a texture inside the builtin resources assigned in the material * Updated changelog Co-authored-by: sebastienlagarde * [HDRP] Fix custom pass volume not executed in scene view (#4860) * Fix custom pass volume not executed in scene view because of the volume culling mask * Updated changelog Co-authored-by: sebastienlagarde * Fix reflection probe tootltip (#4890) Co-authored-by: sebastienlagarde * Updated the Physically Based Sky documentation for baked lights (#4891) * Updated the Physically Based Sky documentation for baked lights * Rewrite Co-authored-by: sebastienlagarde * Fixed remapping of depth pyramid debug (#4893) * Fixed remapping of depth pyramid debug * Removed debug pragma * Update changelog * Updated tooltip * Fix wobble-like (or tearing-like) SSAO issues when temporal reprojection is enabled. (#4895) * Fix AO perceived wobble * changelog Co-authored-by: sebastienlagarde * Fix Asymmetric Projection Matrices and Fog / Pathtracing (#4926) * Check for asymmetric projections and choose the generic path if so. * Fix asymmetric projections for the pathtracer ray generation. * Changelog * Simplify the matrix multiplication for computing the generic matrix. Co-authored-by: sebastienlagarde * Revert: Fix wobble-like (or tearing-like) SSAO issues when temporal reprojection… * Fix GBuffer depth debug mode (#5054) * Fixed Volume Gizmo size when rescaling parent GameObject (#4915) * Fix Vertex Color Mode documentation (#4976) * Fix wobble-like (or tearing-like) SSAO issues when temporal reprojection is enabled. (#4986) * Fix AO perceived wobble * changelog * Update screenshots Co-authored-by: sebastienlagarde * Fix formatting in NestedOverrideCameraRendering * [HDRP] Fix white flash with SSR when resetting camera history (#5089) * Fix white flash with SSR when resetting camera history * Move branch login inside GetPreviousExposureTexture * Fix for fixed exposure * [Fobguz # 1348357] VFX Particle templates missing stencil flags (#5080) * Adding missing macro for stencil flags in particle forward shaders. This will let flags like TAA Reject be useful * Changelog * Fix object disappearing from lookdev (#5063) * Fixed objects disappearing from Lookdev window when entering playmode (case 1309368). * Updated changelog * Added hideflags in Lookdev context * [HDRP] Fix render object after taa jittering (#5088) * Add a pass after TAA to restore non jittered matrices * updated changelog Co-authored-by: sebastienlagarde * Fix GC alloc in hd/bugfix branch (#5134) * Fixed GC alloc on hd/bugfix branch * Fix GC alloc again * Fix refraction tile artifacts near reflection probe edges (#4727) * Pick the right probe at object center instead of tile granularity. * changelog * Missing commit * Move stuff in lightloop and out of prelightData * Update LightLoop.hlsl * Formatting Co-authored-by: sebastienlagarde * Fix camera rotation uncontrollable with low framerate (#5076) * Fix camera rotation uncontrollable with low framerate. * updated changelog * Clearing out render targets and randmo write targets on pipeline destruction (#5176) Changelog Co-authored-by: sebastienlagarde * Fixed a null ref exception when adding a new environment to the library. (#5131) * Fixed a null ref exception when adding a new environment to the library. * Update changelog Co-authored-by: sebastienlagarde * FogBugz#1348462 - Wait for accessing the HDProjectSettings instance as it was before. (#5141) * Fix nullref in volume system after deleting a volume object (#5161) * Fix nullref in volume system after deleting a volume object (case 1348374) * Updated changelog Co-authored-by: sebastienlagarde * [HDRP] Fix APV UI loosing focus when changing a param (#5219) * Fixed the APV UI losing focus when the helpbox about baking appears in the probe volume. * Small changes (#5220) * Fix update order in Graphics Compositor causing jumpy camera updates (#5235) * Prevent material from having infinite intensity (#5132) * Prevent material from having infinite intensity * Fix switching from ldr to hdr emissive * Fix input field precision * Round the max value * Make two variables Co-authored-by: sebastienlagarde * [HDRP] Adding limitations of decal emissive positive contribution to the documentation (#5237) * Add emissive positive contribution limitation to the doc * changelog * Update CHANGELOG.md * Update Decal-Projector.md * Update Decal-Shader.md Co-authored-by: sebastienlagarde * [HDRP] Fix issue with path tracing when switching between non-persistent cameras (#5246) * Fix issue with path traceing accumulation when switching between cameras. * Check if camera history is persistent Co-authored-by: sebastienlagarde * removed undesired files * Fix log base (#5260) * [HDRP] Fixed mask value stored by the LayerMaskParameter class (#5250) * Fixed value stored by the layer mask parameter class. * Updated changelog. Co-authored-by: sebastienlagarde * [HDRP][DXR] Make vertex color default to 1.0 instead of 0.0 (#5268) * When raytracing, make vertex color default to white if not present. * Updated Changelog. * Added comment. * Fix issue with 0-sized dispatch with extremely low resolutions (#5272) * Ceil to int instead. * changelog * [HDRP] Fix incorrect light list indexing when TAA is enabled (#5287) * Fix incorrect light list indexing when TAA is enabled * Better handle XR Co-authored-by: sebastienlagarde * Fix incorrect additiona velocity for alembic (#5304) * Fixed LUT initialization in Wireframe mode (#5156) Co-authored-by: sebastienlagarde * [HDRP] [LightExplorer] Fix missing refreshwhen editing property with a running paused editor. (#5321) * Update HDLightExplorerExtension.cs * Update CHANGELOG.md * Visual Environment component ambient mode now defaults to Dynamic. * Update changelog * Updated test scene with correct ambient mode after the change * Missing files * Last scene fix * Fixed changelog * Fixed VFX tests Co-authored-by: Pavlos Mavridis Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: sebastienlagarde Co-authored-by: John Parsaie Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Antoine Lelievre Co-authored-by: CifaCia Co-authored-by: Adrien de Tocqueville Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Remi Chapelain Co-authored-by: Emmanuel Turquin Co-authored-by: Adrian1066 <44636759+Adrian1066@users.noreply.github.com> Co-authored-by: Kleber Garcia Co-authored-by: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com> Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com> --- .../Scene Settings Profile.asset | 95 +- .../1214_Lit_LowResTransparent.unity | 22 +- .../1x_Materials/1225_Lit_SpeedTree8SG.unity | 20 +- .../Scene Settings Profile.asset | 168 +- .../Scenes/1x_Materials/1301_StackLitSG.unity | 16 +- .../Scene Settings Profile.asset | 131 +- .../1x_Materials/1602_TerrainLit_Normal.unity | 18 +- .../1x_Materials/1801_MaterialQuality.unity | 781 ++-- .../Global Volume Profile.asset | 47 + .../Global Volume Profile.asset.meta | 8 + .../1900_AlphaTest_SG/HDRP_Volume.asset | 68 +- .../1x_Materials/1900_AlphaTest_SG_a.unity | 470 +-- .../HDRP_Default_Sky 1.asset | 134 +- .../2009_MultipleSkies/Sky_Static.asset | 94 +- .../Sky and Fog Settings Profile 1.asset | 2 +- .../2204_ReflectionProbes_Lights.unity | 3602 ++++++++++------- .../Scene Settings Profile.asset | 47 + .../Scene Settings Profile.asset.meta | 8 + .../2206_PlanarReflectionVFace.meta | 8 + .../2206_PlanarReflectionVFace.unity | 571 ++- .../Global Volume Profile.asset | 47 + .../Global Volume Profile.asset.meta | 8 + .../Scene Settings Profile.asset | 65 +- .../2207_ReflectionProbeVFace.meta | 8 + .../2207_ReflectionProbeVFace.unity | 575 ++- .../Global Volume Profile.asset | 47 + .../Global Volume Profile.asset.meta | 8 + .../Scene Settings Profile.asset | 38 +- .../Global Volume Profile.asset | 67 +- .../Global Volume Profile.asset | 61 +- .../Global Volume Profile.asset | 97 +- .../Scene Settings Profile.asset | 267 +- .../MotionBlurProfile.asset | 91 +- .../GlobalVolume Profile.asset | 18 + .../5001_Fog_FogFallback/Volume_Base.asset | 48 +- .../Scene Settings Profile.asset | 125 +- .../5011_VolumetricClouds/GlobalVolume.asset | 90 +- .../Global Volume Profile.asset | 124 +- .../Scene Settings Profile.asset | 34 +- .../Scene Settings Profile.asset | 34 +- .../Scene Settings Profile.asset | 117 +- .../VFXTests/GraphicsTests/HDRP.prefab | 36 +- .../VFXTests/GraphicsTests/HDRP.unity | 5 + .../HDRPFogVolumetric Settings Profile.asset | 90 +- .../GraphicsTests/HDRPFogVolumetric.unity | 220 +- .../GraphicsTests/HDRP_SceneSetting.asset | 35 +- .../GraphicsTests/ParticleRibbonLit.unity | 232 +- .../ParticleRibbonLitVolumeProfile.asset | 94 +- .../CHANGELOG.md | 1 + .../Runtime/Sky/VisualEnvironment.cs | 2 +- 50 files changed, 5691 insertions(+), 3303 deletions(-) create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset index 1cd72badfb8..9b4a1746c0c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset @@ -31,6 +31,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -50,8 +62,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -61,11 +71,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 2.2355762 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -75,10 +86,84 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 9c13f7d97fda704439868458dc2385ed, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity index 2dc6343507f..0daf509640b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity @@ -153,6 +153,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.02, y: -0.94, z: -0.01785475} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 3 @@ -312,7 +313,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -587,6 +588,7 @@ Transform: m_LocalRotation: {x: 0.12893414, y: -0, z: -0, w: 0.99165314} m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 150555374} - {fileID: 1560707990} @@ -622,6 +624,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.05, y: 1.76, z: -0.02} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 2 @@ -821,6 +824,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -836,7 +840,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -920,6 +923,7 @@ Transform: m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1016,6 +1020,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: -3.2892313, z: -0.3983413} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1112,6 +1117,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: -3.2892313, z: -0.3983413} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1208,6 +1214,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: 1.6230732, z: -1.7315147} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1241,6 +1248,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.02, y: -3.01, z: -0.02} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 4 @@ -1419,6 +1427,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: -0.7896553, z: -1.0767106} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -1515,6 +1524,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: -0.7896553, z: -1.0767106} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1548,6 +1558,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.68, y: 2.941782, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 1 @@ -1726,6 +1737,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: 1.6230732, z: -1.7315147} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1759,6 +1771,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.818, y: 2.941782, z: 0} m_LocalScale: {x: 3, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 0 @@ -1871,6 +1884,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.23, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1517719156} - {fileID: 1270125020} @@ -1973,6 +1987,7 @@ Transform: m_LocalRotation: {x: -0.73307997, y: -0, z: -0, w: 0.6801425} m_LocalPosition: {x: -12.526949, y: -0.15709, z: 4.54} m_LocalScale: {x: 2.1692, y: 1, z: 2.3152} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -2022,7 +2037,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -2037,6 +2052,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity index 09d39e319bc..23a0110f8b9 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity @@ -336,6 +336,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.69, y: 0.5, z: -1.441} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -366,6 +367,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 0.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1127870805} m_Father: {fileID: 1935598840} @@ -470,6 +472,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -506,6 +509,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 1.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1636819555} m_Father: {fileID: 1935598840} @@ -537,6 +541,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 0.95154047, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 421122601} m_Father: {fileID: 1025210030} @@ -820,6 +825,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.9515405, y: -3.2690406, z: -4.989624} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1189675139} - {fileID: 1841570170} @@ -949,6 +955,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 2.9515405, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1369615379} m_Father: {fileID: 1025210030} @@ -980,6 +987,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: -0.7708664, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1880594515} m_Father: {fileID: 1935598840} @@ -1030,7 +1038,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -1045,6 +1053,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1087,6 +1096,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: -0.04845953, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 426221817} m_Father: {fileID: 1025210030} @@ -1133,6 +1143,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1209,7 +1220,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -1518,6 +1529,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 1.9515405, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1398137499} m_Father: {fileID: 1025210030} @@ -1654,6 +1666,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.2291336, y: 0.93398416, z: -0.60040474} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2110808628} - {fileID: 568011718} @@ -1752,6 +1765,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0.395, y: 4.331, z: -3.78} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -2090,6 +2104,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.694, y: 0.5, z: 0.55} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -2120,6 +2135,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 2.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1683058730} m_Father: {fileID: 1935598840} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset index b509429d276..6de27ca1bce 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset @@ -4,7 +4,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -20,7 +21,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -31,30 +33,117 @@ MonoBehaviour: 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 + 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: 1 m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &114392438171864176 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -65,48 +154,39 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 - min: 0 - max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 - min: 0 - max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 - min: 0 --- !u!114 &114499654985824276 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -117,49 +197,48 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 exposure: m_OverrideState: 1 m_Value: 0 multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 updateMode: m_OverrideState: 1 m_Value: 0 updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -167,7 +246,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -178,6 +258,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity index a47da77d5f7..da6377ef28e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity @@ -301,6 +301,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -415,6 +416,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.9515405, y: -3.2690406, z: -4.989624} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2108988498} - {fileID: 1703845552} @@ -723,7 +725,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -738,6 +740,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -803,6 +806,11 @@ PrefabInstance: propertyPath: field of view value: 45 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1703845551 @@ -979,6 +987,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0.395, y: 4.331, z: -3.78} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1078,6 +1087,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -1093,7 +1103,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -1218,6 +1227,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1233,7 +1243,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -1317,6 +1326,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset index f5735f97a8a..f939eda6ecf 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset @@ -33,43 +33,33 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 - min: 0 - max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 - min: 0 - max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 - min: 0 --- !u!114 &114374333047554170 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86,8 +76,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -97,11 +85,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -111,37 +100,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -161,8 +137,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -172,11 +146,12 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.0145614 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -186,13 +161,87 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &114883432347898006 MonoBehaviour: m_ObjectHideFlags: 0 @@ -209,6 +258,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity index e9e52f241ba..ac4ed96683a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.047137707, g: 0.06653553, b: 0.105606586, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -238,6 +238,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -253,7 +254,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -337,6 +337,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 8.476068, y: -5.7846136, z: 9.519677} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -414,6 +415,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -463,7 +465,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -478,6 +480,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -510,6 +513,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.9, y: 0, z: 14.26} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1526466806} m_RootOrder: 0 @@ -638,6 +642,11 @@ PrefabInstance: propertyPath: field of view value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: clearColorMode @@ -748,6 +757,7 @@ Transform: m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: -10, y: 0, z: 10} m_LocalScale: {x: 2, y: 1, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -778,6 +788,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 598431484} - {fileID: 1869420999} @@ -812,6 +823,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -1.87, y: 0, z: 14.26} m_LocalScale: {x: 1, y: 1.0000005, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1526466806} m_RootOrder: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity index f0345dd7dc8..c395c6ddbef 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity @@ -24,7 +24,7 @@ RenderSettings: m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 4 + m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,7 +153,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 513 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -198,51 +265,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 513 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!20 &42229485 Camera: m_ObjectHideFlags: 0 @@ -296,6 +318,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -9.561, y: 3.34, z: 1.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1177063882} m_Father: {fileID: 0} @@ -344,10 +367,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -391,6 +416,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.699999, y: 3.27, z: 9.58} m_LocalScale: {x: 1.6464, y: 1.6464, z: 1.6464} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -402,11 +428,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1502620697} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 1 - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -417,6 +438,31 @@ PrefabInstance: Reflection on low' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01953125 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -432,6 +478,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -447,16 +498,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -472,21 +513,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 0.01953125 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -511,6 +537,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 104.8 @@ -523,6 +553,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -10 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -535,14 +569,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -568,7 +594,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -577,30 +603,30 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 512 + propertyPath: xrLayout + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: waitFrames value: 1 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: xrLayout - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipelineAsset value: objectReference: {fileID: 11400000, guid: a1e896277e7aec54dab400844753769a, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 512 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &345783686 stripped @@ -609,6 +635,55 @@ Transform: type: 3} m_PrefabInstance: {fileID: 345783685} m_PrefabAsset: {fileID: 0} +--- !u!1 &788298197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788298199} + - component: {fileID: 788298198} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &788298198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788298197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: e933dcbd683c300418703544e87bd63e, type: 2} +--- !u!4 &788298199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788298197} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -133.65039, y: -9.035299, z: 33.127846} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1177063881 PrefabInstance: m_ObjectHideFlags: 0 @@ -616,11 +691,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 42229486} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 1 - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -628,6 +698,31 @@ PrefabInstance: Reflection on low' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01953125 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -643,6 +738,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -658,16 +758,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -683,21 +773,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 0.01953125 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -741,53 +816,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 0 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -800,15 +828,23 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -817,6 +853,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005811052381 @@ -827,12 +871,63 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 2 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 4 defaultFrameSettings: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &1502620696 Camera: m_ObjectHideFlags: 0 @@ -886,6 +981,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -9.561, y: 3.34, z: 1.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 292073641} m_Father: {fileID: 0} @@ -923,101 +1019,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1034,6 +1035,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 19.89, y: 0.01, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1046,30 +1058,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 19.89, y: 0.01, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: -0.70710677, y: 0, z: 0, w: 0.70710677} + resolutionScalable: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 1 renderingPathCustomFrameSettings: @@ -1082,6 +1088,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 1 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1099,8 +1109,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1177,6 +1187,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1220,6 +1232,9 @@ MonoBehaviour: e32: 0 e33: 0 m_CapturePosition: {x: 0, y: 0, z: 0} + m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} + m_FieldOfView: 0 + m_Aspect: 0 m_CustomRenderData: m_WorldToCameraRHS: e00: 0 @@ -1256,13 +1271,139 @@ MonoBehaviour: e32: 0 e33: 0 m_CapturePosition: {x: 0, y: 0, z: 0} - m_EditorOnlyData: 0 - m_PlanarProbeVersion: 6 + m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} + m_FieldOfView: 0 + m_Aspect: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} + m_PlanarProbeVersion: 7 m_ObsoleteCaptureNearPlane: 0.3 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} --- !u!23 &1553371902 MeshRenderer: m_ObjectHideFlags: 0 @@ -1274,10 +1415,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1313,7 +1456,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} @@ -1335,6 +1478,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.7, y: 1.55, z: 9.27} m_LocalScale: {x: 1.9826, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1370,8 +1514,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} + m_StaticLightingCloudsUniqueID: 0 --- !u!4 &1608707855 Transform: m_ObjectHideFlags: 1 @@ -1382,6 +1525,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1416,22 +1560,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 1 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1439,16 +1577,25 @@ MonoBehaviour: 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_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 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 @@ -1456,6 +1603,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 @@ -1486,6 +1636,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1501,7 +1659,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1766079452 Light: m_ObjectHideFlags: 0 @@ -1561,6 +1729,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 &1766079453 @@ -1573,6 +1742,7 @@ Transform: m_LocalRotation: {x: 0.16987649, y: -0.029034924, z: -0.25718543, w: 0.95087045} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1606,6 +1776,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2.3899999} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 345783686} m_RootOrder: 0 @@ -1620,7 +1791,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: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1635,10 +1806,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 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/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset new file mode 100644 index 00000000000..47071e5eb8c --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 996082102067431880} +--- !u!114 &996082102067431880 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..284763b28f4 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e933dcbd683c300418703544e87bd63e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset index b25adcbecfb..d334e59a614 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset @@ -29,21 +29,15 @@ MonoBehaviour: m_Name: HDShadowSettings m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 20 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 0 m_Value: 0.05 @@ -78,12 +72,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 200 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -93,11 +84,9 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.4660715 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} @@ -110,13 +99,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 1 + m_Value: + mode: 0 + customValue: 200 + additiveValue: 0 + multiplyValue: 0 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -132,31 +143,21 @@ MonoBehaviour: 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 @@ -166,6 +167,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &114827887035766406 MonoBehaviour: m_ObjectHideFlags: 3 @@ -179,13 +193,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity index eaf457a709f..86d143105d1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.31014416, g: 0.3259645, b: 0.36057484, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -152,6 +152,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -10.475559, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 1 @@ -189,6 +190,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -245,6 +247,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 113455552} - {fileID: 1780913221} @@ -279,6 +282,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94484690} m_RootOrder: 0 @@ -294,6 +298,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -360,6 +365,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 6, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 1 @@ -375,6 +381,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -439,6 +446,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1319188787} - {fileID: 115245477} @@ -488,6 +496,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 0 @@ -503,6 +512,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -569,6 +579,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3, y: 0.29, z: 3.1899986} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 1 @@ -606,6 +617,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -679,6 +691,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -711,6 +724,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -4.475559, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 2 @@ -748,6 +762,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -806,6 +821,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1823638298} m_RootOrder: 0 @@ -821,6 +837,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -903,6 +920,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -951,6 +969,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.98, y: 1, z: 2.8} m_LocalScale: {x: 18, y: 23.44351, z: 30} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -981,6 +1000,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 11.65} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 266337116} - {fileID: 1063039922} @@ -1016,6 +1036,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 2 @@ -1031,6 +1052,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1098,6 +1120,7 @@ Transform: m_LocalRotation: {x: -0.0000020191073, y: -0.7071068, z: 0.7071068, w: 0.0000020191073} m_LocalPosition: {x: 2, y: -0.06, z: 3.4799995} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 2 @@ -1127,6 +1150,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1193,6 +1217,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -16.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 2 @@ -1236,6 +1261,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1294,6 +1320,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1823638298} m_RootOrder: 1 @@ -1309,6 +1336,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1373,6 +1401,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.37, y: 0.09998665, z: 16.256203} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1693407631} - {fileID: 1943064970} @@ -1409,6 +1438,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16.47556, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 0 @@ -1446,6 +1476,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1504,6 +1535,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 2 @@ -1519,6 +1551,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1585,6 +1618,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3, y: -0.16, z: 3.1899986} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 0 @@ -1622,6 +1656,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1680,6 +1715,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 6, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 1 @@ -1695,6 +1731,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1740,6 +1777,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: m_LocalPosition.x value: -4.945982 @@ -1752,6 +1793,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.423647 objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -1764,14 +1809,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 114542892872663716, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: sharedProfile @@ -1817,6 +1854,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1585461826} - {fileID: 848590138} @@ -1855,6 +1893,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 0 @@ -1870,6 +1909,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1954,6 +1994,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1986,6 +2027,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -22.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 3 @@ -2027,6 +2069,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2083,6 +2126,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.475559, y: 0.09998665, z: 16.256203} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 935026619} - {fileID: 68673008} @@ -2134,6 +2178,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2182,6 +2227,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.9799995, y: -1, z: 2.8} m_LocalScale: {x: 18, y: 23.44351, z: 30} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -2214,6 +2260,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -4.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 0 @@ -2253,6 +2300,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2294,6 +2342,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -2 @@ -2306,6 +2358,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 19 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -2318,14 +2374,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -2337,14 +2385,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic size - value: 5 + propertyPath: field of view + value: 109.5 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_TargetTexture value: objectReference: {fileID: 0} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: orthographic size + value: 5 + objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_NormalizedViewPortRect.x @@ -2365,16 +2418,6 @@ PrefabInstance: propertyPath: m_NormalizedViewPortRect.height value: 1 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: field of view - value: 109.5 - objectReference: {fileID: 0} - - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipeline @@ -2383,12 +2426,12 @@ PrefabInstance: type: 2} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2396,6 +2439,11 @@ PrefabInstance: propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 0} + - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -2408,62 +2456,67 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + propertyPath: m_Version + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: backgroundColorHDR.b + value: 0.07843138 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableShadow - value: 0 + propertyPath: backgroundColorHDR.g + value: 0.182577 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableContactShadows + propertyPath: backgroundColorHDR.r + value: 0.23529412 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteFrameSettings.enableSSR value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableShadowMask + propertyPath: m_ObsoleteFrameSettings.enableSSAO value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSSR + propertyPath: m_ObsoleteFrameSettings.runSSRAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSSAO + propertyPath: m_ObsoleteFrameSettings.enableDecals value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSubsurfaceScattering + propertyPath: m_ObsoleteFrameSettings.enableShadow value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransmission + propertyPath: m_ObsoleteFrameSettings.runSSAOAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableAtmosphericScattering + propertyPath: m_ObsoleteFrameSettings.shaderLitMode value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableVolumetrics + propertyPath: m_ObsoleteFrameSettings.enableDistortion value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableReprojectionForVolumetrics + propertyPath: m_ObsoleteFrameSettings.enableShadowMask value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2473,62 +2526,62 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.diffuseGlobalDimmer + propertyPath: m_ObsoleteFrameSettings.enablePostprocess value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.specularGlobalDimmer + propertyPath: m_ObsoleteFrameSettings.enableVolumetrics value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.shaderLitMode + propertyPath: m_ObsoleteFrameSettings.runLightListAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransparentPrepass + propertyPath: m_ObsoleteFrameSettings.enableAsyncCompute value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableMotionVectors + propertyPath: m_ObsoleteFrameSettings.enableTransmission value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableObjectMotionVectors + propertyPath: m_ObsoleteFrameSettings.diffuseGlobalDimmer value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableDecals + propertyPath: m_ObsoleteFrameSettings.enableMotionVectors value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableRoughRefraction + propertyPath: m_ObsoleteFrameSettings.enableOpaqueObjects value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransparentPostpass + propertyPath: m_ObsoleteFrameSettings.enableContactShadows value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableDistortion + propertyPath: m_ObsoleteFrameSettings.specularGlobalDimmer value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enablePostprocess + propertyPath: m_ObsoleteFrameSettings.enableRoughRefraction value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableOpaqueObjects + propertyPath: m_ObsoleteFrameSettings.runContactShadowsAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2538,88 +2591,88 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableRealtimePlanarReflection + propertyPath: m_ObsoleteFrameSettings.enableTransparentPrepass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableAsyncCompute + propertyPath: m_ObsoleteFrameSettings.enableObjectMotionVectors value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runLightListAsync + propertyPath: m_ObsoleteFrameSettings.enableTransparentPostpass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runSSRAsync - value: 0 + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runSSAOAsync + propertyPath: m_ObsoleteFrameSettings.enableSubsurfaceScattering value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runContactShadowsAsync + propertyPath: m_ObsoleteFrameSettings.runVolumeVoxelizationAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runVolumeVoxelizationAsync + propertyPath: m_ObsoleteFrameSettings.enableAtmosphericScattering value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableDeferredTileAndCluster + propertyPath: m_ObsoleteFrameSettings.enableRealtimePlanarReflection value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightEvaluation + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightVariants + propertyPath: m_ObsoleteFrameSettings.enableReprojectionForVolumetrics value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeMaterialVariants + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableBigTilePrepass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableFptlForForwardOpaque + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightVariants value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableBigTilePrepass + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableFptlForForwardOpaque value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightEvaluation value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.r - value: 0.23529412 + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableDeferredTileAndCluster + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0.182577 + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeMaterialVariants + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.07843138 + propertyPath: xrLayout + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -2631,11 +2684,6 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 800 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: xrLayout - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -2672,6 +2720,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94484690} m_RootOrder: 1 @@ -2687,6 +2736,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2765,6 +2815,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: -6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 464369562} - {fileID: 817363608} @@ -2799,6 +2850,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -10.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 1 @@ -2838,6 +2890,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2868,107 +2921,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2003875549 -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 &1132392170045009 GameObject: m_ObjectHideFlags: 0 @@ -3015,6 +2967,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.5, y: 10, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -3029,6 +2982,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.5, y: 10, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -3131,53 +3085,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0.054901958, g: 0.14509805, b: 0.13433173, a: 0} clearDepth: 1 @@ -3195,15 +3102,18 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3212,6 +3122,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005818916700 @@ -3225,25 +3143,14 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 1 data2: 0 defaultFrameSettings: 0 ---- !u!114 &114777191937075999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1132392170045009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 7 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -3290,6 +3197,18 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 +--- !u!114 &114777191937075999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132392170045009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} + m_Name: + m_EditorClassIdentifier: clearColorMode: 1 backgroundColorHDR: {r: 0.09642992, g: 0.078987196, b: 0.23584908, a: 0} clearDepth: 1 @@ -3307,15 +3226,18 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3324,6 +3246,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005818916701 @@ -3337,9 +3267,57 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 1 data2: 0 defaultFrameSettings: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset index 0decdd2ce68..57bfd4fe7e4 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset @@ -3,31 +3,121 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 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: HDRP_Default_Sky 1 m_EditorClassIdentifier: - rotation: 160 - exposure: 0 - multiplier: 0.2 - resolution: 256 - updateMode: 0 - updatePeriod: 0 - lightingOverride: {fileID: 0} - atmosphericScatteringSettings: - type: 0 - colorMode: 1 - fogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - mipFogMaxMip: 1 - mipFogNear: 0 - mipFogFar: 1000 - linearFogDensity: 1 - linearFogStart: 500 - linearFogEnd: 1000 - expFogDistance: 100 - expFogDensity: 1 - skyHDRI: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + active: 1 + rotation: + m_OverrideState: 0 + m_Value: 0 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + 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 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + hdriSky: + m_OverrideState: 0 + m_Value: {fileID: 0} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset index 4056100d5db..a5f5dd0b48d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -51,12 +59,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -66,11 +71,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 0.46608552 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -80,10 +86,84 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset index 402320a6482..e37ca7317eb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset @@ -426,7 +426,7 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity index 33d4081d9c3..b2fd68c3a8c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -148,6 +150,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.284, y: -2.0546, z: 0} m_LocalScale: {x: 1.5273, y: 1.5273, z: 1.5273} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 777764088} - {fileID: 1481904499} @@ -187,6 +190,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.32, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 400404840} - {fileID: 611033635} @@ -205,101 +209,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -316,6 +225,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -328,30 +248,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -364,6 +278,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -381,8 +299,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -459,6 +377,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -544,7 +464,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -565,10 +608,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -612,8 +657,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -631,7 +676,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -665,6 +710,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.201, y: -0.342, z: -1.262} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 229635437} m_RootOrder: 2 @@ -693,10 +739,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -759,6 +807,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: -0.342, z: -0.743} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 2 @@ -787,10 +836,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -853,6 +904,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 973768864} m_RootOrder: 0 @@ -881,10 +933,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -946,6 +1000,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.3011, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 5 @@ -961,10 +1016,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1028,6 +1085,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7390002, y: -0.44000039, z: -0.344} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1667517191} - {fileID: 703441991} @@ -1048,101 +1106,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1159,6 +1122,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1171,30 +1145,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -1207,6 +1175,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1224,8 +1196,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1302,6 +1274,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1387,7 +1361,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -1408,10 +1505,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1455,8 +1554,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -1474,7 +1573,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -1508,6 +1607,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1342837068} m_RootOrder: 0 @@ -1536,10 +1636,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1602,6 +1704,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.617, y: -0.342, z: -1.244} m_LocalScale: {x: 0.23569697, y: 0.23569697, z: 0.23569697} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 4 @@ -1630,10 +1733,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1696,6 +1801,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15513, y: 0.15513, z: 0.15513} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 703441991} m_RootOrder: 0 @@ -1724,10 +1830,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1789,6 +1897,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.54, y: -4.2893, z: 0} m_LocalScale: {x: 385.1731, y: 3.8790157, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 2 @@ -1804,10 +1913,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1869,6 +1980,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 21096330} m_RootOrder: 0 @@ -1884,10 +1996,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1949,6 +2063,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.638, y: 0.17, z: -1.724} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1091291962} m_Father: {fileID: 1098561660} @@ -1966,22 +2081,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1996,6 +2105,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2012,7 +2124,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 @@ -2043,8 +2157,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2060,7 +2180,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &437088011 Light: m_ObjectHideFlags: 0 @@ -2120,6 +2250,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 &475434060 @@ -2152,22 +2283,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - 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_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2182,6 +2307,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2198,7 +2326,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 @@ -2229,8 +2359,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -2246,7 +2382,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &475434063 Light: m_ObjectHideFlags: 0 @@ -2306,6 +2452,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 &475434064 @@ -2318,6 +2465,7 @@ Transform: m_LocalRotation: {x: 0.67753434, y: -0.27373418, z: 0.31773764, w: 0.6042017} m_LocalPosition: {x: 5.5331078, y: -15.559323, z: 38.527405} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -2351,6 +2499,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1183693015} m_RootOrder: 0 @@ -2379,10 +2528,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2444,6 +2595,7 @@ Transform: m_LocalRotation: {x: 0.1877043, y: -0.2808559, z: -0.09246844, w: 0.9366625} m_LocalPosition: {x: 0.043, y: 0.572, z: -2.515} m_LocalScale: {x: 4.265915, y: 4.265915, z: 4.265915} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1227910975} m_Father: {fileID: 1481904499} @@ -2461,22 +2613,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2491,6 +2637,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2507,7 +2656,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 @@ -2538,8 +2689,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2555,7 +2712,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &513507484 Light: m_ObjectHideFlags: 0 @@ -2615,6 +2782,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 &516317389 @@ -2647,6 +2815,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.78, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1894137919} - {fileID: 1939633831} @@ -2667,101 +2836,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -2778,6 +2852,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -2790,30 +2875,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2826,6 +2905,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2843,8 +2926,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2921,6 +3004,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -3006,7 +3091,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -3027,10 +3235,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3074,8 +3284,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -3093,7 +3303,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -3126,6 +3336,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.87, y: -0.44842, z: 0} m_LocalScale: {x: 327.0256, y: 3.8790162, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 0 @@ -3141,10 +3352,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3207,6 +3420,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1891725936} m_RootOrder: 0 @@ -3235,10 +3449,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3300,6 +3516,7 @@ Transform: m_LocalRotation: {x: -0.00000043315177, y: 0.91290903, z: 0.40816325, w: -0.00000021523823} m_LocalPosition: {x: -0.062, y: -1.032, z: -0.534} m_LocalScale: {x: 1.9597181, y: 0.25220236, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1446512204} m_Father: {fileID: 21096330} @@ -3317,22 +3534,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3347,6 +3558,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3363,7 +3577,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 @@ -3394,8 +3610,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3411,7 +3633,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &611033640 Light: m_ObjectHideFlags: 0 @@ -3471,6 +3703,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.2520332} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &614162063 @@ -3501,6 +3734,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1657149774} m_RootOrder: 0 @@ -3516,10 +3750,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3581,6 +3817,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.638, y: 0.17, z: -1.724} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 854704549} m_Father: {fileID: 229635437} @@ -3598,22 +3835,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3628,6 +3859,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3644,7 +3878,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 @@ -3675,8 +3911,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3692,7 +3934,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &617468368 Light: m_ObjectHideFlags: 0 @@ -3752,6 +4004,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 &681941806 @@ -3782,6 +4035,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.70710677, w: 0.7071068} m_LocalPosition: {x: -10.7737, y: -2.4550998, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 15 @@ -3819,10 +4073,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3876,6 +4132,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: 0, z: -1.362} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 363705271} m_Father: {fileID: 229635437} @@ -3893,22 +4150,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3923,6 +4174,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3939,7 +4193,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 @@ -3970,8 +4226,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3987,7 +4249,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &703441994 Light: m_ObjectHideFlags: 0 @@ -4047,6 +4319,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 &777764087 @@ -4079,6 +4352,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.32, y: -0.44000039, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1459415260} - {fileID: 1342837068} @@ -4097,101 +4371,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -4208,6 +4387,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -4220,30 +4410,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4256,6 +4440,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4273,8 +4461,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4351,6 +4539,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -4436,7 +4626,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -4457,10 +4770,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4504,8 +4819,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -4523,7 +4838,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -4571,6 +4886,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1892780867} m_RootOrder: 0 @@ -4599,10 +4915,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4665,6 +4983,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15512997, y: 0.15512997, z: 0.15512997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 617468365} m_RootOrder: 0 @@ -4693,10 +5012,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4758,6 +5079,7 @@ Transform: m_LocalRotation: {x: 0.6015178, y: 0.4811885, z: 0.2609177, w: 0.5818557} m_LocalPosition: {x: -0.763, y: -0.111, z: -0.938} m_LocalScale: {x: 1.7410467, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 124817707} m_Father: {fileID: 516317390} @@ -4775,22 +5097,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4805,6 +5121,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4821,7 +5140,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 @@ -4852,8 +5173,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4869,7 +5196,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &973768867 Light: m_ObjectHideFlags: 0 @@ -4929,6 +5266,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &980292724 @@ -4959,6 +5297,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.4602, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 4 @@ -4974,10 +5313,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5039,6 +5380,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1081795512} m_RootOrder: 0 @@ -5054,10 +5396,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5117,6 +5461,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.284, y: 1, z: 0} m_LocalScale: {x: 1.5273, y: 1.5273, z: 1.5273} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1098561660} - {fileID: 1102244886} @@ -5156,6 +5501,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 8.250001, y: 0.5199999, z: -0.364} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1509218596} m_Father: {fileID: 1022855023} @@ -5173,101 +5519,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -5284,6 +5535,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -5296,30 +5558,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -5332,6 +5588,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -5349,8 +5609,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -5427,6 +5687,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -5512,7 +5774,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -5533,10 +5918,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5580,8 +5967,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -5599,7 +5986,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -5634,6 +6021,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.78, y: -0.44000006, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1003728041} - {fileID: 1640950923} @@ -5654,101 +6042,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -5765,6 +6058,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -5777,30 +6081,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -5813,6 +6111,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -5830,8 +6132,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -5908,6 +6210,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -5993,7 +6297,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -6014,10 +6441,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6061,8 +6490,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -6080,7 +6509,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6114,6 +6543,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15512997, y: 0.15512997, z: 0.15512997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 437088008} m_RootOrder: 0 @@ -6142,10 +6572,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6209,8 +6641,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -6228,7 +6660,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6243,6 +6675,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7390002, y: 0.5199999, z: -0.344} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1701459356} - {fileID: 1918702563} @@ -6263,101 +6696,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -6374,18 +6712,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 1 m_BoxSize: {x: 10, y: 10, z: 10} m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} @@ -6397,19 +6723,36 @@ MonoBehaviour: m_SphereRadius: 2 m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6422,6 +6765,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6439,8 +6786,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6517,6 +6864,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -6602,7 +6951,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -6623,10 +7095,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6690,6 +7164,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6299998, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1363967057} - {fileID: 2002286226} @@ -6711,101 +7186,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -6822,6 +7202,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -6834,30 +7225,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6870,6 +7255,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6887,8 +7276,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6965,6 +7354,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -7050,7 +7441,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -7071,10 +7585,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7118,8 +7634,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -7137,7 +7653,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -7171,6 +7687,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15513, y: 0.15513, z: 0.15513} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1918702563} m_RootOrder: 0 @@ -7199,10 +7716,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7264,6 +7783,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10.062, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 8 @@ -7279,10 +7799,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7344,6 +7866,7 @@ Transform: m_LocalRotation: {x: 0.25129914, y: 0.19393967, z: 0.18873338, w: 0.92930937} m_LocalPosition: {x: -0.118, y: 0.541, z: -2.237} m_LocalScale: {x: 25.55, y: 25.55, z: 25.55} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1477123744} m_Father: {fileID: 1102244886} @@ -7361,22 +7884,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -7391,6 +7908,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -7407,7 +7927,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 @@ -7438,8 +7960,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7455,7 +7983,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1162519692 Light: m_ObjectHideFlags: 0 @@ -7515,6 +8053,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 &1180222689 @@ -7545,6 +8084,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.3806, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790162, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 3 @@ -7560,10 +8100,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7625,6 +8167,7 @@ Transform: m_LocalRotation: {x: -0.15337509, y: -0.11439086, z: 0.036997784, w: 0.9808272} m_LocalPosition: {x: 0.52, y: -1.015, z: 0.098} m_LocalScale: {x: 1.741047, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 505559235} m_Father: {fileID: 516317390} @@ -7642,22 +8185,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -7672,6 +8209,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -7688,7 +8228,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 @@ -7719,8 +8261,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7736,7 +8284,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1183693018 Light: m_ObjectHideFlags: 0 @@ -7796,6 +8354,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1227157678 @@ -7826,6 +8385,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.46, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 12 @@ -7865,10 +8425,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7923,6 +8485,7 @@ Transform: m_LocalRotation: {x: -0.18770431, y: 0.2808559, z: 0.09246845, w: 0.9366625} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03636499, y: 0.036364995, z: 0.03636499} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 513507481} m_RootOrder: 0 @@ -7951,10 +8514,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8016,6 +8581,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.3870299, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 11 @@ -8055,10 +8621,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8113,6 +8681,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: -0.342, z: -0.743} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 2 @@ -8141,10 +8710,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8206,6 +8777,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 7.307, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 13 @@ -8245,10 +8817,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8303,6 +8877,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1640950923} m_RootOrder: 0 @@ -8331,10 +8906,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8396,6 +8973,7 @@ Transform: m_LocalRotation: {x: -0.00000043315177, y: 0.91290903, z: 0.40816325, w: -0.00000021523823} m_LocalPosition: {x: -0.062, y: -1.032, z: -0.534} m_LocalScale: {x: 1.9597181, y: 0.25220236, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 307748058} m_Father: {fileID: 777764088} @@ -8413,22 +8991,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -8443,6 +9015,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -8459,7 +9034,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 @@ -8490,8 +9067,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -8507,7 +9090,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1342837071 Light: m_ObjectHideFlags: 0 @@ -8567,6 +9160,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.2520332} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1349151176 @@ -8598,6 +9192,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1939633831} m_RootOrder: 0 @@ -8626,10 +9221,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8691,6 +9288,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 0 @@ -8706,10 +9304,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8771,6 +9371,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.081, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 9 @@ -8810,10 +9411,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8867,6 +9470,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.8, y: 3.3924, z: 0} m_LocalScale: {x: 330.4813, y: 3.8790157, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 1 @@ -8882,10 +9486,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8948,6 +9554,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 611033635} m_RootOrder: 0 @@ -8976,10 +9583,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9041,6 +9650,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 777764088} m_RootOrder: 0 @@ -9056,10 +9666,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9122,6 +9734,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1162519689} m_RootOrder: 0 @@ -9150,10 +9763,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9217,6 +9832,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6299998, y: -0.44000039, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1651282835} - {fileID: 513507481} @@ -9238,101 +9854,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -9349,6 +9870,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -9361,30 +9893,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -9397,6 +9923,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9414,8 +9944,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -9492,6 +10022,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -9577,7 +10109,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -9598,10 +10253,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9645,8 +10302,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -9664,7 +10321,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -9695,6 +10352,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 525944184} - {fileID: 1432237597} @@ -9743,6 +10401,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1033495927} m_RootOrder: 0 @@ -9758,10 +10417,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9823,6 +10484,7 @@ Transform: m_LocalRotation: {x: -0.15337509, y: -0.11439086, z: 0.036997784, w: 0.9808272} m_LocalPosition: {x: 0.52, y: -1.015, z: 0.098} m_LocalScale: {x: 1.741047, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1588342439} m_Father: {fileID: 1081795512} @@ -9840,22 +10502,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -9870,6 +10526,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -9886,7 +10545,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 @@ -9917,8 +10578,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -9934,7 +10601,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1552828732 Light: m_ObjectHideFlags: 0 @@ -9994,6 +10671,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1588342438 @@ -10025,6 +10703,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1552828729} m_RootOrder: 0 @@ -10053,10 +10732,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10102,48 +10783,48 @@ PrefabInstance: value: Background objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + propertyPath: m_RootOrder + value: 2 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + propertyPath: m_LocalScale.x + value: 1240.0674 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalPosition.z - value: 5.6 + propertyPath: m_LocalScale.y + value: 744.0404 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + propertyPath: m_LocalScale.z + value: 49.60269 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_LocalPosition.z + value: 5.6 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_RootOrder - value: 2 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.x - value: 1240.0674 + propertyPath: m_LocalRotation.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.y - value: 744.0404 + propertyPath: m_LocalRotation.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.z - value: 49.60269 + propertyPath: m_LocalRotation.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 23096287020260212, guid: e6be141ec19d3554489da286b19b90b2, type: 3} @@ -10185,6 +10866,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.1419, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 6 @@ -10200,10 +10882,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10265,6 +10949,7 @@ Transform: m_LocalRotation: {x: 0.35460198, y: 0.72358406, z: 0.5515062, w: 0.21569538} m_LocalPosition: {x: -0.062, y: 0.698, z: -1.249} m_LocalScale: {x: 1.7410431, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1336388560} m_Father: {fileID: 1081795512} @@ -10282,22 +10967,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -10312,6 +10991,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -10328,7 +11010,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 @@ -10359,8 +11043,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10376,7 +11066,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1640950926 Light: m_ObjectHideFlags: 0 @@ -10436,6 +11136,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.4778197} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1641932329 @@ -10466,6 +11167,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.70710677, w: 0.7071068} m_LocalPosition: {x: -10.7737, y: 1.3919002, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 14 @@ -10503,10 +11205,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10560,6 +11264,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 0 @@ -10575,10 +11280,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10634,126 +11341,32 @@ GameObject: m_IsActive: 1 --- !u!4 &1657149774 Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1657149773} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.250001, y: -0.44000039, z: -0.364} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 614162064} - m_Father: {fileID: 834778} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1657149775 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1657149773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657149773} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.250001, y: -0.44000039, z: -0.364} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 614162064} + m_Father: {fileID: 834778} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1657149775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657149773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} + m_Name: + m_EditorClassIdentifier: m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -10770,6 +11383,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -10782,30 +11406,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -10818,6 +11436,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -10835,8 +11457,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -10913,6 +11535,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -10998,7 +11622,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -11019,10 +11766,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11066,8 +11815,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -11085,7 +11834,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -11119,11 +11868,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 0} + sharedProfile: {fileID: 11400000, guid: eaf61362679e76e4f929f6c59bb804e1, type: 2} --- !u!4 &1664385614 Transform: m_ObjectHideFlags: 0 @@ -11134,6 +11883,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -11166,6 +11916,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 229635437} m_RootOrder: 0 @@ -11181,10 +11932,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11247,10 +12000,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11294,6 +12049,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1098561660} m_RootOrder: 0 @@ -11341,6 +12097,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -11373,6 +12130,7 @@ Transform: m_LocalRotation: {x: 0.6015178, y: 0.4811885, z: 0.2609177, w: 0.5818557} m_LocalPosition: {x: -0.763, y: -0.111, z: -0.938} m_LocalScale: {x: 1.7410467, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 580852481} m_Father: {fileID: 1081795512} @@ -11390,22 +12148,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -11420,6 +12172,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11436,7 +12191,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 @@ -11467,8 +12224,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11484,7 +12247,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1891725939 Light: m_ObjectHideFlags: 0 @@ -11544,6 +12317,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1892780866 @@ -11574,6 +12348,7 @@ Transform: m_LocalRotation: {x: 0.25129914, y: 0.19393967, z: 0.18873338, w: 0.92930937} m_LocalPosition: {x: -0.118, y: 0.541, z: -2.237} m_LocalScale: {x: 25.55, y: 25.55, z: 25.55} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 833411595} m_Father: {fileID: 1481904499} @@ -11591,22 +12366,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -11621,6 +12390,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11637,7 +12409,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 @@ -11668,8 +12442,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11685,7 +12465,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1892780870 Light: m_ObjectHideFlags: 0 @@ -11745,6 +12535,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 &1894137918 @@ -11775,6 +12566,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 516317390} m_RootOrder: 0 @@ -11790,10 +12582,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11855,6 +12649,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: 0, z: -1.362} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1104315614} m_Father: {fileID: 1098561660} @@ -11872,22 +12667,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -11902,6 +12691,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11918,7 +12710,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 @@ -11949,8 +12743,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11966,7 +12766,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1918702566 Light: m_ObjectHideFlags: 0 @@ -12026,6 +12836,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 &1939633830 @@ -12056,6 +12867,7 @@ Transform: m_LocalRotation: {x: 0.35460198, y: 0.72358406, z: 0.5515062, w: 0.21569538} m_LocalPosition: {x: -0.062, y: 0.698, z: -1.249} m_LocalScale: {x: 1.7410431, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1349151177} m_Father: {fileID: 516317390} @@ -12073,22 +12885,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12103,6 +12909,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12119,7 +12928,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 @@ -12150,8 +12961,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12167,7 +12984,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1939633834 Light: m_ObjectHideFlags: 0 @@ -12227,6 +13054,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.4778197} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &1965177827 @@ -12236,6 +13064,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -1.28 @@ -12248,6 +13080,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -16.42 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -12260,14 +13096,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -12284,13 +13112,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic size - value: 7.27 + propertyPath: far clip plane + value: 200 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: far clip plane - value: 200 + propertyPath: orthographic size + value: 7.27 objectReference: {fileID: 0} - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -12314,23 +13142,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.r - value: 0.41902542 + propertyPath: m_Version + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0 + propertyPath: backgroundColorHDR.b + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 1 + propertyPath: backgroundColorHDR.g + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: backgroundColorHDR.r + value: 0.41902542 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -12373,6 +13201,7 @@ Transform: m_LocalRotation: {x: -0.18770431, y: 0.2808559, z: 0.09246845, w: 0.9366625} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03636499, y: 0.036364995, z: 0.03636499} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2002286226} m_RootOrder: 0 @@ -12401,10 +13230,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12467,6 +13298,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.617, y: -0.342, z: -1.244} m_LocalScale: {x: 0.23569697, y: 0.23569697, z: 0.23569697} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 4 @@ -12495,10 +13327,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12560,6 +13394,7 @@ Transform: m_LocalRotation: {x: 0.1877043, y: -0.2808559, z: -0.09246844, w: 0.9366625} m_LocalPosition: {x: 0.043, y: 0.572, z: -2.515} m_LocalScale: {x: 4.265915, y: 4.265915, z: 4.265915} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1975323122} m_Father: {fileID: 1102244886} @@ -12577,22 +13412,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12607,6 +13436,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12623,7 +13455,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 @@ -12654,8 +13488,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12671,7 +13511,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &2002286229 Light: m_ObjectHideFlags: 0 @@ -12731,6 +13581,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 &2024496926 @@ -12761,6 +13612,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.234, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 10 @@ -12800,10 +13652,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12858,6 +13712,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.201, y: -0.342, z: -1.262} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1098561660} m_RootOrder: 2 @@ -12886,10 +13741,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12951,6 +13808,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.2215, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 7 @@ -12966,10 +13824,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset new file mode 100644 index 00000000000..424b5fccbcf --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2802844970268307975 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Scene Settings Profile + m_EditorClassIdentifier: + components: + - {fileID: -2802844970268307975} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta new file mode 100644 index 00000000000..aa5476f6bb6 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaf61362679e76e4f929f6c59bb804e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta new file mode 100644 index 00000000000..9b57dbf74ce --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cc02d11705d5db45ad1d2c20eeaff28 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity index 6d8cfd4ca65..dd4b39a1a8a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.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,6 +153,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.9772458, y: 1.2323846, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 6 @@ -188,10 +191,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -263,6 +268,7 @@ Transform: m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133565904} m_RootOrder: 0 @@ -279,22 +285,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -309,6 +309,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -325,7 +328,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 @@ -356,8 +361,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -373,7 +384,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &126516509 Light: m_ObjectHideFlags: 0 @@ -433,6 +454,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 &201797804 @@ -463,6 +485,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133565904} m_RootOrder: 1 @@ -479,22 +502,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -509,6 +526,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -525,7 +545,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 @@ -556,8 +578,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -573,7 +601,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &201797808 Light: m_ObjectHideFlags: 0 @@ -633,6 +671,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 &269421424 @@ -664,6 +703,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.757613, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 2 @@ -701,10 +741,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -777,6 +819,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.061559, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 3 @@ -814,10 +857,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -890,6 +935,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642561276} m_RootOrder: 0 @@ -904,9 +950,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 &335665651 MeshRenderer: @@ -919,10 +965,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -982,6 +1030,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1371258325} - {fileID: 2113193874} @@ -1026,6 +1075,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.526878, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 5 @@ -1063,10 +1113,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1139,6 +1191,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1347699, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 4 @@ -1176,10 +1229,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1252,6 +1307,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2020093, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 9 @@ -1289,10 +1345,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1367,7 +1425,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 1835560861516 + data2: 4539628424389459968 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -1414,51 +1537,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 1835560861516 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!114 &717369283 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1475,16 +1553,23 @@ MonoBehaviour: TargetWidth: 900 TargetHeight: 300 PerPixelCorrectnessThreshold: 0.001 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.0001 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 waitFrames: 0 xrCompatible: 1 - checkMemoryAllocation: 0 xrThresholdMultiplier: 1 + checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} --- !u!20 &717369285 @@ -1540,6 +1625,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -7.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1580,6 +1666,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.004, y: 1.494, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 8 @@ -1624,10 +1711,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1671,6 +1760,55 @@ MonoBehaviour: forceTargetDimensions: {x: 200, y: 150} overrideTestSettings: 0 textMesh: {fileID: 745353039} +--- !u!1 &1099230126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1099230128} + - component: {fileID: 1099230127} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1099230127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099230126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: e7a5716611aa9124aa74579682e9613f, type: 2} +--- !u!4 &1099230128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099230126} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1133565903 GameObject: m_ObjectHideFlags: 0 @@ -1697,6 +1835,7 @@ Transform: m_LocalRotation: {x: -0.000000014901161, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 126516506} - {fileID: 201797805} @@ -1731,6 +1870,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 0 @@ -1746,10 +1886,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1812,6 +1954,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4902725, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 0 @@ -1849,10 +1992,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1924,6 +2069,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 3 @@ -1939,10 +2085,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2004,6 +2152,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 4 @@ -2019,10 +2168,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2084,6 +2235,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 2 @@ -2099,10 +2251,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2162,6 +2316,7 @@ Transform: m_LocalRotation: {x: -0.7660445, y: 0, z: 0, w: 0.64278764} m_LocalPosition: {x: 0, y: 0, z: 2.68} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 335665649} - {fileID: 1941161074} @@ -2196,6 +2351,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 1 @@ -2211,10 +2367,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2277,6 +2435,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.9567593, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 10 @@ -2314,10 +2473,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2387,6 +2548,7 @@ Transform: m_LocalRotation: {x: 0.0000007152557, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1268796610} - {fileID: 1673723394} @@ -2425,6 +2587,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 5 @@ -2440,10 +2603,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2504,6 +2669,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642561276} m_RootOrder: 1 @@ -2520,101 +2686,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 20, y: 0.01, z: 20} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 1 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 1 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -2631,6 +2702,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 20, y: 0.01, z: 20} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -2643,30 +2725,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + proxy: m_Shape: 0 - m_BoxSize: {x: 20, y: 0.01, z: 20} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0.00000014883372, z: -0.000000009804136} mirrorRotationProxySpace: {x: -0.7071068, y: 0, z: 0, w: 0.70710677} + resolutionScalable: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2679,6 +2755,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2696,8 +2776,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 1 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 1 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2774,6 +2854,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -2859,13 +2941,136 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 - m_PlanarProbeVersion: 6 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 20, y: 0.01, z: 20} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 1 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 1 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} + m_PlanarProbeVersion: 7 m_ObsoleteCaptureNearPlane: 1 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} --- !u!1 &2041147246 GameObject: m_ObjectHideFlags: 0 @@ -2895,6 +3100,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9772458, y: 1.2323846, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 7 @@ -2932,10 +3138,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3008,6 +3216,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.830824, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 1 @@ -3045,10 +3254,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 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/2206_PlanarReflectionVFace/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset new file mode 100644 index 00000000000..e4d84e0f72c --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 8615675033778428043} +--- !u!114 &8615675033778428043 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..62d8ea524db --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7a5716611aa9124aa74579682e9613f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset index 0351529a4de..ab65c9b4760 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset @@ -33,8 +33,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -44,11 +42,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -58,28 +57,18 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 top: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0.3962264, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 middle: m_OverrideState: 1 m_Value: {r: 0.040939845, g: 0.23264207, b: 0.3773585, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 bottom: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 gradientDiffusion: m_OverrideState: 1 m_Value: 1 @@ -99,43 +88,33 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 - min: 0 - max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 - min: 0 - max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 - min: 0 --- !u!114 &114265733008192460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -152,8 +131,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -163,11 +140,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -177,37 +155,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -227,6 +192,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 3 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta new file mode 100644 index 00000000000..e497014c27e --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ca8ec8257727b242aa2c3bc221eecf5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity index 75af5f53f46..7f1b3e7ed03 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.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,6 +153,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.757613, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 2 @@ -206,10 +209,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -263,6 +268,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 5 @@ -278,10 +284,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -343,6 +351,7 @@ Transform: m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299818200} m_RootOrder: 0 @@ -359,22 +368,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -389,6 +392,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -405,7 +411,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 @@ -436,8 +444,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -453,7 +467,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &258139814 Light: m_ObjectHideFlags: 0 @@ -513,6 +537,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 &346223608 @@ -544,6 +569,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 870276854} m_RootOrder: 1 @@ -558,9 +584,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 &346223611 MeshRenderer: @@ -573,10 +599,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -638,6 +666,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 0 @@ -653,10 +682,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -718,6 +749,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299818200} m_RootOrder: 1 @@ -734,22 +766,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -764,6 +790,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -780,7 +809,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 @@ -811,8 +842,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -828,7 +865,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &550499123 Light: m_ObjectHideFlags: 0 @@ -888,6 +935,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 &660003400 @@ -926,6 +974,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.5130266, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 8 @@ -988,10 +1037,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1043,6 +1094,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1245386076} - {fileID: 1892878110} @@ -1084,6 +1136,7 @@ Transform: m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} m_LocalPosition: {x: 0, y: 0.63, z: 2.17} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1345844771} - {fileID: 346223609} @@ -1118,6 +1171,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 1 @@ -1133,10 +1187,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1199,6 +1255,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1469717, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 4 @@ -1254,10 +1311,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1312,6 +1371,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4902725, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 0 @@ -1367,10 +1427,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1422,6 +1484,7 @@ Transform: m_LocalRotation: {x: 0.0000007152557, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 359289198} - {fileID: 1151135188} @@ -1458,6 +1521,7 @@ Transform: m_LocalRotation: {x: -0.000000014901161, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 258139811} - {fileID: 550499120} @@ -1492,6 +1556,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.00000011920929, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 870276854} m_RootOrder: 0 @@ -1508,101 +1573,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 15.122394 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 0 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 1 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 1 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 1 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 1 - runSSRAsync: 1 - runSSAOAsync: 1 - runContactShadowsAsync: 1 - runVolumeVoxelizationAsync: 1 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 23 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1619,6 +1589,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 15.122394 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1631,30 +1612,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 15.122394 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -1667,6 +1642,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1684,8 +1663,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1762,6 +1741,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1847,7 +1828,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 15.122394 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 0 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 1 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 1 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 1 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 1 + runSSRAsync: 1 + runSSAOAsync: 1 + runContactShadowsAsync: 1 + runVolumeVoxelizationAsync: 1 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 23 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 @@ -1867,8 +1971,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 1 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -1886,10 +1990,59 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1 &1358735759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1358735761} + - component: {fileID: 1358735760} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1358735760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1358735759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f2b49193f73321a469fe116f6f4ba701, type: 2} +--- !u!4 &1358735761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1358735759} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1582879334 GameObject: m_ObjectHideFlags: 0 @@ -1919,6 +2072,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.061559, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 3 @@ -1974,10 +2128,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2031,6 +2187,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 2 @@ -2046,10 +2203,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2112,6 +2271,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2159861, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 9 @@ -2167,10 +2327,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2225,6 +2387,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.830824, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 1 @@ -2280,10 +2443,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2338,6 +2503,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.9707361, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 10 @@ -2393,10 +2559,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2450,6 +2618,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 3 @@ -2465,10 +2634,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2531,6 +2702,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9894476, y: 1.2445863, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 7 @@ -2586,10 +2758,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2643,6 +2817,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 4 @@ -2658,10 +2833,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2724,6 +2901,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.526878, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 5 @@ -2779,10 +2957,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2837,6 +3017,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.9894476, y: 1.2445863, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 6 @@ -2892,10 +3073,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2999,16 +3182,23 @@ MonoBehaviour: TargetWidth: 900 TargetHeight: 300 PerPixelCorrectnessThreshold: 0.001 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.0001 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 waitFrames: 0 xrCompatible: 1 - checkMemoryAllocation: 0 xrThresholdMultiplier: 1 + checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} --- !u!114 &2123398363 @@ -3023,7 +3213,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70280697347933 + data2: 4539628424926265344 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -3070,51 +3325,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70280697347933 - data2: 4539628424926265344 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!4 &2123398364 Transform: m_ObjectHideFlags: 0 @@ -3125,6 +3335,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -7.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset new file mode 100644 index 00000000000..1da793d75f9 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6982758880431881621 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: -6982758880431881621} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..5d1db2b718b --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2b49193f73321a469fe116f6f4ba701 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset index 562b56ea927..696162dbf06 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset @@ -29,13 +29,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 2 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 2 @@ -52,16 +60,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -96,12 +103,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -111,11 +115,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -125,37 +130,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0, g: 1, b: 0.09278011, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.88122773, g: 1, b: 0, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset index 40d18ef6e46..57a6000fa7b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -119,19 +118,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -156,7 +151,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &-5120183026951368462 MonoBehaviour: m_ObjectHideFlags: 3 @@ -170,13 +164,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -209,12 +211,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -224,11 +223,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.0145767 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.38545167, y: 0.41750622, z: 0.5} @@ -241,34 +238,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 0} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -284,31 +282,21 @@ MonoBehaviour: 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 @@ -318,3 +306,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset index 27be71b38aa..b608a514539 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -51,12 +59,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -66,11 +71,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.18875 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.4402014, y: 0.45416793, z: 0.5} @@ -83,34 +86,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 21bb9ef0ab3fe414bacf326d4f1d8ee2, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -126,31 +130,21 @@ MonoBehaviour: 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 @@ -160,3 +154,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset index 9b074ca40ff..657ac1e21d7 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset @@ -13,84 +13,114 @@ MonoBehaviour: m_Name: ScreenSpaceReflection m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 enabled: m_OverrideState: 1 m_Value: 1 - rayTracing: + tracing: m_OverrideState: 0 - m_Value: 0 - minSmoothness: + m_Value: 1 + m_MinSmoothness: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 - smoothnessFadeStart: + m_SmoothnessFadeStart: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 + usedAlgorithm: + m_OverrideState: 0 + m_Value: 0 depthBufferThickness: m_OverrideState: 1 m_Value: 0.006 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 + accumulationFactor: + m_OverrideState: 0 + m_Value: 0.75 + m_RayMaxIterations: + m_OverrideState: 1 + m_Value: 128 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 - rayLength: + textureLodBias: + m_OverrideState: 0 + m_Value: 1 + m_RayLength: m_OverrideState: 0 m_Value: 10 - min: 0.001 - max: 50 - clampValue: + m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 - denoise: + m_Denoise: m_OverrideState: 0 m_Value: 0 - denoiserRadius: + m_DenoiserRadius: m_OverrideState: 0 m_Value: 8 - min: 1 - max: 32 - mode: + m_AffectSmoothSurfaces: m_OverrideState: 0 - m_Value: 2 - upscaleRadius: + m_Value: 0 + mode: m_OverrideState: 0 m_Value: 2 - fullResolution: + m_FullResolution: m_OverrideState: 0 m_Value: 0 sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 - m_RayMaxIterations: + m_RayMaxIterationsRT: + m_OverrideState: 0 + m_Value: 48 +--- !u!114 &-1508565263743468274 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: m_OverrideState: 1 - m_Value: 128 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105,3 +135,4 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: -3706306561061678719} + - {fileID: -1508565263743468274} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset index 9710f0685db..d36197d7152 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 2 @@ -36,50 +44,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 colorMode: m_OverrideState: 1 m_Value: 1 color: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} density: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 maxFogDistance: m_OverrideState: 1 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 1 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 1 m_Value: 1000 - min: 0 fogDistance: m_OverrideState: 1 m_Value: 200 - min: 0 fogBaseHeight: m_OverrideState: 1 m_Value: 0 fogHeightAttenuation: m_OverrideState: 1 m_Value: 0.2 - min: 0 - max: 1 --- !u!114 &-3990501575690934820 MonoBehaviour: m_ObjectHideFlags: 3 @@ -93,7 +90,6 @@ MonoBehaviour: m_Name: LiftGammaGain m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 lift: m_OverrideState: 0 m_Value: {x: 1, y: 1, z: 1, w: 0} @@ -116,16 +112,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -160,10 +155,6 @@ MonoBehaviour: m_Name: DepthOfField m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 - useQualitySettings: - m_OverrideState: 0 - m_Value: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -173,49 +164,42 @@ MonoBehaviour: focusDistance: m_OverrideState: 1 m_Value: 10 - min: 0.1 + focusDistanceMode: + m_OverrideState: 0 + m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 0 - min: 0 nearFocusEnd: m_OverrideState: 1 m_Value: 4 - min: 0 farFocusStart: m_OverrideState: 1 m_Value: 10 - min: 0 farFocusEnd: m_OverrideState: 1 m_Value: 20 - min: 0 m_NearSampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 5 - min: 3 - max: 8 m_NearMaxBlur: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 4 - min: 0 - max: 8 m_FarSampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 7 - min: 3 - max: 16 m_FarMaxBlur: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 8 - min: 0 - max: 16 - m_HighQualityFiltering: - m_OverrideState: 1 - m_Value: 1 m_Resolution: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 2 + m_HighQualityFiltering: + m_OverrideState: 0 + m_Value: 1 + m_PhysicallyBased: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -251,12 +235,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -266,11 +247,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 5.2074246 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -280,13 +262,87 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &2523018487990756456 MonoBehaviour: m_ObjectHideFlags: 3 @@ -300,12 +356,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -315,11 +368,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -329,37 +383,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -376,41 +417,39 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 - useQualitySettings: - m_OverrideState: 0 - m_Value: 0 quality: m_OverrideState: 0 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 2.5 - min: 0 maximumVelocity: m_OverrideState: 0 m_Value: 200 - min: 0 - max: 1500 minimumVelocity: m_OverrideState: 0 m_Value: 2 - min: 0 - max: 64 + cameraMotionBlur: + m_OverrideState: 0 + m_Value: 1 + specialCameraClampMode: + m_OverrideState: 0 + m_Value: 0 + cameraVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 + cameraTranslationVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 cameraRotationVelocityClamp: m_OverrideState: 1 m_Value: 0.1 - min: 0 - max: 0.2 depthComparisonExtent: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 20 m_SampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 8 - min: 2 --- !u!114 &6271081758499213648 MonoBehaviour: m_ObjectHideFlags: 3 @@ -424,7 +463,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -434,52 +475,66 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} maxFogDistance: m_OverrideState: 1 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 1 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 1 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 maximumHeight: m_OverrideState: 0 m_Value: 50 - albedo: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 200 - min: 1 enableVolumetricFog: m_OverrideState: 0 m_Value: 0 - anisotropy: + albedo: m_OverrideState: 0 - m_Value: 0 - min: -1 - max: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 + depthExtent: + m_OverrideState: 0 + m_Value: 64 + denoisingMode: + m_OverrideState: 0 + m_Value: 2 + anisotropy: + m_OverrideState: 0 + m_Value: 0 + sliceDistributionUniformity: + m_OverrideState: 0 + m_Value: 0.75 + m_FogControlMode: + m_OverrideState: 0 + m_Value: 0 + screenResolutionPercentage: + m_OverrideState: 0 + m_Value: 12.5 + volumeSliceCount: + m_OverrideState: 0 + m_Value: 64 + m_VolumetricFogBudget: + m_OverrideState: 0 + m_Value: 0.33 + m_ResolutionDepthRatio: + m_OverrideState: 0 + m_Value: 0.666 + directionalLightsOnly: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset index 21eb0a5201f..bc6f1a69033 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset @@ -13,41 +13,39 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 20 - min: 0 maximumVelocity: m_OverrideState: 1 m_Value: 200 - min: 0 - max: 1500 minimumVelocity: m_OverrideState: 1 m_Value: 2 - min: 0 - max: 64 + cameraMotionBlur: + m_OverrideState: 0 + m_Value: 1 + specialCameraClampMode: + m_OverrideState: 0 + m_Value: 0 + cameraVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 + cameraTranslationVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 cameraRotationVelocityClamp: m_OverrideState: 1 m_Value: 0.03 - min: 0 - max: 0.2 depthComparisonExtent: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 20 - cameraMotionBlur: - m_OverrideState: 0 - m_Value: 1 m_SampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 8 - min: 2 --- !u!114 &-3307415950195135037 MonoBehaviour: m_ObjectHideFlags: 3 @@ -61,13 +59,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -84,12 +90,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 289 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -99,11 +102,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.4222085 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -116,34 +117,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 5fb993a599e7e9b4b825e1a28e6d2c07, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + scrollOrientation: + m_OverrideState: 1 + m_Value: + mode: 0 + customValue: 289 + additiveValue: 0 + multiplyValue: 0 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -159,31 +161,21 @@ MonoBehaviour: 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 @@ -193,6 +185,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset index 407ccee8257..c0291b7b671 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset @@ -20,8 +20,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -227,6 +233,9 @@ MonoBehaviour: focusDistance: m_OverrideState: 0 m_Value: 10 + focusDistanceMode: + m_OverrideState: 0 + m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 0.72 @@ -328,6 +337,9 @@ MonoBehaviour: focusDistance: m_OverrideState: 0 m_Value: 10 + focusDistanceMode: + m_OverrideState: 0 + m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 1.47 @@ -400,6 +412,12 @@ MonoBehaviour: skyAmbientMode: m_OverrideState: 0 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset index 248494ecfae..1d7d2de8219 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset @@ -30,7 +30,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 0 @@ -38,8 +37,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 @@ -56,7 +61,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 1 quality: m_OverrideState: 0 m_Value: 1 @@ -69,32 +73,21 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 1, g: 0, b: 0, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 500 - min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.7 - min: 0 - max: 1 mipFogNear: m_OverrideState: 1 m_Value: 25 - min: 0 mipFogFar: m_OverrideState: 1 m_Value: 100 - min: 0 baseHeight: m_OverrideState: 1 m_Value: 500 @@ -104,61 +97,42 @@ MonoBehaviour: meanFreePath: m_OverrideState: 1 m_Value: 50 - min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 albedo: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 1 m_Value: 25 - min: 0.1 denoisingMode: m_OverrideState: 1 m_Value: 0 anisotropy: m_OverrideState: 1 m_Value: 0 - min: -1 - max: 1 sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 - min: 0 - max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 1 m_Value: 25 - min: 6.25 - max: 100 volumeSliceCount: m_OverrideState: 1 m_Value: 128 - min: 1 - max: 1024 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 - min: 0 - max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 - min: 0 - max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -175,21 +149,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -224,13 +192,9 @@ MonoBehaviour: m_Name: VolumetricLightingController m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 depthExtent: m_OverrideState: 1 m_Value: 25 - min: 0.1 sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 - min: 0 - max: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset index ae25336a76b..e6d895399a6 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 0 m_Value: 0 @@ -119,19 +118,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -156,7 +151,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &-6901118705532630215 MonoBehaviour: m_ObjectHideFlags: 3 @@ -170,46 +164,33 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 2 toeStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 toeLength: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 shoulderStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 shoulderLength: m_OverrideState: 0 m_Value: 0.5 - min: 0 shoulderAngle: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 gamma: m_OverrideState: 0 m_Value: 1 - min: 0.001 lutTexture: m_OverrideState: 0 m_Value: {fileID: 0} lutContribution: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 --- !u!114 &-1982369472900735902 MonoBehaviour: m_ObjectHideFlags: 3 @@ -223,37 +204,27 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 2 threshold: m_OverrideState: 1 m_Value: 0 - min: 0 intensity: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 scatter: m_OverrideState: 1 m_Value: 0.65 - min: 0 - max: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 anamorphic: m_OverrideState: 0 m_Value: 1 @@ -279,12 +250,9 @@ MonoBehaviour: m_Name: CloudLayer m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 1 opacity: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 @@ -294,20 +262,18 @@ MonoBehaviour: resolution: m_OverrideState: 0 m_Value: 1024 - shadowOpacity: + shadowMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 shadowTint: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - shadowsResolution: - m_OverrideState: 1 - m_Value: 512 + shadowResolution: + m_OverrideState: 0 + m_Value: 256 + shadowSize: + m_OverrideState: 0 + m_Value: 500 layerA: cloudMap: m_OverrideState: 1 @@ -315,49 +281,41 @@ MonoBehaviour: opacityR: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 opacityG: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 opacityB: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 opacityA: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 tint: m_OverrideState: 1 m_Value: {r: 0.8396226, g: 0.66069466, b: 0.5029815, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 exposure: m_OverrideState: 1 m_Value: 0 distortionMode: m_OverrideState: 0 m_Value: 0 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 1 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -367,13 +325,9 @@ MonoBehaviour: steps: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 thickness: m_OverrideState: 1 m_Value: 0.36 - min: 0 - max: 1 castShadows: m_OverrideState: 1 m_Value: 1 @@ -384,49 +338,41 @@ MonoBehaviour: opacityR: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 opacityG: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 opacityB: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 opacityA: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 exposure: m_OverrideState: 1 m_Value: -3.5 distortionMode: m_OverrideState: 0 m_Value: 0 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 1 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -436,13 +382,9 @@ MonoBehaviour: steps: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 10 thickness: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 castShadows: m_OverrideState: 0 m_Value: 0 @@ -477,7 +419,6 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 @@ -485,8 +426,14 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 1 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 - m_Value: 1 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset index 9c9f5fddac2..c7c00db08d3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 @@ -21,8 +20,14 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -39,7 +44,6 @@ MonoBehaviour: m_Name: Fog m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -52,32 +56,21 @@ MonoBehaviour: color: m_OverrideState: 0 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 0 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 @@ -87,61 +80,42 @@ MonoBehaviour: meanFreePath: m_OverrideState: 0 m_Value: 400 - min: 1 enableVolumetricFog: m_OverrideState: 0 m_Value: 0 albedo: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - min: 0.1 denoisingMode: m_OverrideState: 0 m_Value: 2 anisotropy: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 0 m_Value: 12.5 - min: 6.25 - max: 50 volumeSliceCount: m_OverrideState: 0 m_Value: 64 - min: 1 - max: 512 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 - min: 0 - max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 - min: 0 - max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -175,12 +149,9 @@ MonoBehaviour: m_Name: PhysicallyBasedSky 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 @@ -190,11 +161,9 @@ MonoBehaviour: 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} @@ -207,7 +176,6 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 @@ -223,66 +191,42 @@ MonoBehaviour: planetaryRadius: m_OverrideState: 0 m_Value: 6378100 - min: 0 planetCenterPosition: m_OverrideState: 0 m_Value: {x: 0, y: -6378100, z: 0} airDensityR: m_OverrideState: 0 m_Value: 0.04534 - min: 0 - max: 1 airDensityG: m_OverrideState: 0 m_Value: 0.10237241 - min: 0 - max: 1 airDensityB: m_OverrideState: 0 m_Value: 0.23264056 - min: 0 - max: 1 airTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 airMaximumAltitude: m_OverrideState: 0 m_Value: 55261.973 - min: 0 aerosolDensity: m_OverrideState: 0 m_Value: 0.01192826 - min: 0 - max: 1 aerosolTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 0.9, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 aerosolMaximumAltitude: m_OverrideState: 0 m_Value: 8289.296 - min: 0 aerosolAnisotropy: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 numberOfBounces: m_OverrideState: 0 m_Value: 8 - min: 1 - max: 10 groundTint: m_OverrideState: 1 m_Value: {r: 0.31621575, g: 0.3454625, b: 0.3584906, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 groundColorTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -292,7 +236,6 @@ MonoBehaviour: groundEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 planetRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -302,42 +245,27 @@ MonoBehaviour: spaceEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 spaceRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} colorSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 horizonTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 zenithTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 horizonZenithShift: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 m_SkyVersion: 1 m_ObsoleteEarthPreset: m_OverrideState: 0 @@ -355,7 +283,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -461,19 +388,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -498,4 +421,3 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset index 766eb60a56b..baadbcb6211 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset @@ -29,7 +29,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 2 @@ -39,80 +38,62 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 radius: m_OverrideState: 1 m_Value: 1 - min: 0.25 - max: 5 spatialBilateralAggressiveness: m_OverrideState: 0 m_Value: 0.15 - min: 0 - max: 1 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 - m_StepCount: + occluderMotionRejection: m_OverrideState: 0 - m_Value: 6 - min: 2 - max: 32 - m_FullResolution: + m_Value: 1 + receiverMotionRejection: m_OverrideState: 0 - m_Value: 0 + m_Value: 1 + m_StepCount: + m_OverrideState: 1 + m_Value: 16 + m_FullResolution: + m_OverrideState: 1 + m_Value: 1 m_MaximumRadiusInPixels: - m_OverrideState: 0 - m_Value: 40 - min: 16 - max: 256 + m_OverrideState: 1 + m_Value: 80 m_BilateralUpsample: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 m_DirectionCount: - m_OverrideState: 0 - m_Value: 2 - min: 1 - max: 6 + m_OverrideState: 1 + m_Value: 4 m_RayLength: - m_OverrideState: 0 - m_Value: 0.5 - min: 0 - max: 50 + m_OverrideState: 1 + m_Value: 20 m_SampleCount: - m_OverrideState: 0 - m_Value: 1 - min: 1 - max: 64 + m_OverrideState: 1 + m_Value: 8 m_Denoise: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: - m_OverrideState: 0 - m_Value: 1 - min: 0.001 - max: 1 + m_OverrideState: 1 + m_Value: 0.65 --- !u!114 &5586737667120579711 MonoBehaviour: m_ObjectHideFlags: 3 @@ -126,13 +107,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -149,12 +138,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -164,11 +150,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 5.20731 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.4714623, y: 0.4714616, z: 0.5} @@ -181,34 +165,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -224,31 +209,21 @@ MonoBehaviour: 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 @@ -258,3 +233,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset index 5ecdae9653e..b15653f0ac6 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset @@ -12,4 +12,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: Scene Settings Profile m_EditorClassIdentifier: - components: [] + components: + - {fileID: 525883688551753881} +--- !u!114 &525883688551753881 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset index 5ecdae9653e..8eee8ea84c1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset @@ -12,4 +12,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: Scene Settings Profile m_EditorClassIdentifier: - components: [] + components: + - {fileID: 2568591178948852223} +--- !u!114 &2568591178948852223 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset index f19f670668c..af61475a199 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -61,17 +60,97 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + limitMinCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -12 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 18 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + limitMaxCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -8 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 22 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 adaptationMode: m_OverrideState: 1 m_Value: 1 adaptationSpeedDarkToLight: m_OverrideState: 1 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 1 m_Value: 1 - min: 0.001 + weightTextureMask: + m_OverrideState: 0 + m_Value: {fileID: 0} + histogramPercentages: + m_OverrideState: 0 + m_Value: {x: 40, y: 90} + histogramUseCurveRemapping: + m_OverrideState: 0 + m_Value: 0 + targetMidGray: + m_OverrideState: 0 + m_Value: 0 + centerAroundExposureTarget: + m_OverrideState: 0 + m_Value: 0 + proceduralCenter: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + proceduralRadii: + m_OverrideState: 0 + m_Value: {x: 0.3, y: 0.3} + maskMinIntensity: + m_OverrideState: 0 + m_Value: -30 + maskMaxIntensity: + m_OverrideState: 0 + m_Value: 30 + proceduralSoftness: + m_OverrideState: 0 + m_Value: 0.5 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86,3 +165,35 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: -6322084644017855310} + - {fileID: 1052189620847248129} +--- !u!114 &1052189620847248129 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab index 3a8d6f51094..1ca0b685b78 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5870183540159428618} - {fileID: 5870183540305807088} @@ -64,6 +65,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 0 @@ -148,10 +150,12 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -166,7 +170,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 72204296650588 @@ -180,13 +191,14 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 0 defaultFrameSettings: 0 - m_Version: 7 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -261,6 +273,7 @@ Transform: m_LocalRotation: {x: 0.31429538, y: 0.3457062, z: -0.124121174, w: 0.8753854} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 1 @@ -422,6 +435,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -437,7 +451,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -477,6 +490,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 4 @@ -493,7 +507,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -512,6 +526,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 0dac2c76303e9a74e87ebaaea403fadc, type: 2} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!1 &5870183541445562935 GameObject: m_ObjectHideFlags: 0 @@ -540,6 +556,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 3 @@ -701,6 +718,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -716,7 +734,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -756,6 +773,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 2 @@ -799,6 +817,7 @@ VisualEffect: m_Array: [] --- !u!73398921 &5870183541744189769 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -816,15 +835,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity index ffd1ba377a6..429267bc182 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity @@ -191,6 +191,11 @@ PrefabInstance: propertyPath: m_Name value: HDRP objectReference: {fileID: 0} + - target: {fileID: 5870183540159428619, guid: 0ecfb9aa1bc41c049aab025283598019, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5870183541744189769, guid: 0ecfb9aa1bc41c049aab025283598019, type: 3} propertyPath: m_Materials.Array.data[0] diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset index 48ab8fcdf1f..4b454e5a79d 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset @@ -30,12 +30,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -45,11 +42,9 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -62,37 +57,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -109,13 +91,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 2 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 @@ -132,21 +122,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -181,7 +165,9 @@ MonoBehaviour: m_Name: Fog m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -191,70 +177,66 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 300 - min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 1 m_Value: 1 maximumHeight: m_OverrideState: 1 m_Value: 20 - albedo: - m_OverrideState: 1 - m_Value: {r: 1, g: 0.8970642, b: 0, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 2.5 - min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 - anisotropy: + albedo: m_OverrideState: 1 - m_Value: 0.5 - min: -1 - max: 1 + m_Value: {r: 1, g: 0.8970642, b: 0, a: 1} globalLightProbeDimmer: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - min: 0.1 + denoisingMode: + m_OverrideState: 0 + m_Value: 2 + anisotropy: + m_OverrideState: 1 + m_Value: 0.5 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 - filter: + m_FogControlMode: + m_OverrideState: 0 + m_Value: 0 + screenResolutionPercentage: + m_OverrideState: 0 + m_Value: 12.5 + volumeSliceCount: + m_OverrideState: 0 + m_Value: 64 + m_VolumetricFogBudget: + m_OverrideState: 0 + m_Value: 0.33 + m_ResolutionDepthRatio: + m_OverrideState: 0 + m_Value: 0.666 + directionalLightsOnly: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity index b9eae9a9b30..5c9ebe6c49c 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity @@ -167,6 +167,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -215,6 +216,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.155, y: 5.969, z: 24.196} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -300,6 +302,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -15.42, y: 5.24, z: 15.99} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -316,53 +319,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 0 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -380,10 +336,12 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -398,6 +356,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 17521319083853 @@ -411,12 +377,60 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 0 defaultFrameSettings: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!114 &270514561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -467,11 +481,17 @@ MonoBehaviour: TargetWidth: 512 TargetHeight: 512 PerPixelCorrectnessThreshold: 0 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.001 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 captureFrameRate: 20 + fixedTimeStepScale: 1 simulateTime: 5.95 xrCompatible: 1 --- !u!4 &299252011 @@ -484,6 +504,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -520,6 +541,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: c0b22c5d4a882d04997474b651f04a14, type: 2} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!114 &493913624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -532,7 +555,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -547,6 +570,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -595,6 +619,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -643,6 +668,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.77, y: 1.59, z: 35.26} m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -718,12 +744,14 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 24} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!73398921 &674445798 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -733,6 +761,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -740,19 +769,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -816,6 +832,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -864,6 +881,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.32, y: 3.14, z: 28.52} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -888,6 +906,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1382437304 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -897,6 +916,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -904,19 +924,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -990,6 +997,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 27} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -1037,6 +1045,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1085,6 +1094,7 @@ Transform: m_LocalRotation: {x: -0.20829226, y: 0.32973933, z: 0.07485625, w: 0.9177597} m_LocalPosition: {x: -14.19, y: 5.72, z: 26.04} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1109,6 +1119,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1486284230 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1118,6 +1129,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1125,19 +1137,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1211,6 +1210,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -1235,6 +1235,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1527903407 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1244,6 +1245,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1251,19 +1253,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1337,6 +1326,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 33} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -1431,6 +1421,7 @@ Transform: m_LocalRotation: {x: 0.29175767, y: -0.050442208, z: 0.12781513, w: 0.9465708} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1447,22 +1438,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - 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.141593 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1477,6 +1462,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1526,9 +1514,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -1544,10 +1537,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!1 &2067038241 GameObject: m_ObjectHideFlags: 0 @@ -1591,6 +1591,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1639,6 +1640,7 @@ Transform: m_LocalRotation: {x: -0.20829226, y: 0.32973933, z: 0.07485625, w: 0.9177597} m_LocalPosition: {x: -18.95, y: 4.17, z: 26.04} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset index 104ccf34a4c..9da6c7ed2b3 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset @@ -83,16 +83,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -127,13 +126,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 3 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 1 @@ -150,12 +157,9 @@ MonoBehaviour: m_Name: GradientSky 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 @@ -165,11 +169,12 @@ MonoBehaviour: 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 @@ -179,28 +184,18 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 top: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 middle: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 bottom: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 gradientDiffusion: m_OverrideState: 0 m_Value: 1 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity index e132c6795f2..ae6caad07e6 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,22 +153,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 6000 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -181,6 +177,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -197,7 +196,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 @@ -228,8 +229,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -245,7 +252,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &196708717 Light: m_ObjectHideFlags: 0 @@ -305,6 +322,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 &196708718 @@ -317,6 +335,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.0313, y: 0.6618, z: 0.0736} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -352,7 +371,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 1 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -399,51 +483,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 1 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!81 &762437740 AudioListener: m_ObjectHideFlags: 0 @@ -505,6 +544,7 @@ Transform: m_LocalRotation: {x: 0.003963616, y: 0.9929508, z: -0.035168, w: 0.11312072} m_LocalPosition: {x: -0.43010604, y: 0.22291613, z: 2.0188065} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -539,22 +579,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 0 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -569,6 +603,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -585,7 +622,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 @@ -616,8 +655,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -633,7 +678,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &774493051 Light: m_ObjectHideFlags: 0 @@ -693,6 +748,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 &774493052 @@ -705,6 +761,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -729,6 +786,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1001802347 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -738,6 +796,7 @@ VFXRenderer: m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -745,8 +804,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -780,6 +837,7 @@ VisualEffect: m_InitialEventNameOverriden: 0 m_StartSeed: 0 m_ResetSeedOnPlay: 0 + m_ResourceVersion: 1 m_PropertySheet: m_Float: m_Array: [] @@ -813,6 +871,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.076, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -846,7 +905,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -861,6 +920,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9172678, y: -0.07954121, z: 5.81527} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -894,7 +954,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -909,6 +969,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9119453, y: 10.3260975, z: 2.7467709} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -943,22 +1004,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 60000 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -973,6 +1028,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -989,7 +1047,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 @@ -1020,8 +1080,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1037,7 +1103,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1853046272 Light: m_ObjectHideFlags: 0 @@ -1097,6 +1173,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 &1853046273 @@ -1109,6 +1186,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0555, y: 0.6618, z: 0.1548} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset index 495be543386..ab7511dfbb4 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset @@ -13,12 +13,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -28,11 +25,12 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.46608552 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -42,13 +40,87 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &-60721801795345313 MonoBehaviour: m_ObjectHideFlags: 3 @@ -62,13 +134,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 3a79de186f0..8ee90654455 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -488,6 +488,7 @@ The version number for this package has increased due to a version update of a r - Make some volumetric clouds properties additional to reduce the number default parameters (case 1357926). - Renamed the Cloud Offset to Cloud Map Offset in the volumetric clouds volume component (case 1358528). - Made debug panel mip bias functions internal, not public. +- Visual Environment ambient mode is now Dynamic by default. ## [11.0.0] - 2020-10-21 diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs index a3b74156caf..06b4e581719 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs @@ -17,7 +17,7 @@ public sealed class VisualEnvironment : VolumeComponent /// Type of clouds that should be used for rendering. public NoInterpIntParameter cloudType = new NoInterpIntParameter(0); /// Defines the way the ambient probe should be computed. - public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Static); + public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Dynamic); /// Controls the global orientation of the wind relative to the X world vector. [Header("Wind")] From 299ec92a8f04913e0069ce69e6e8332e890c0cd8 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Wed, 1 Sep 2021 12:28:25 +0200 Subject: [PATCH 008/149] Filters out concerned platform by compilation fail (#5493) Related to the usage of 08b03824843e33840a03794c433c3cef (VFXLitSphereOutput.cs) --- .../Assets/TestCaseFilters.asset | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset index d0f12e14d12..201697e1da8 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset @@ -41,3 +41,25 @@ MonoBehaviour: XrSdk: StereoModes: 0 Reason: See https://fogbugz.unity3d.com/f/cases/1351595/ + - FilteredScene: {fileID: 0} + FilteredScenes: + - {fileID: 102900000, guid: 0379b72b85eee8045afdaec3b1362957, type: 3} + - {fileID: 102900000, guid: 2744a8931e888734bae7f74874fefdf5, type: 3} + - {fileID: 102900000, guid: 04855e9751809c7488746e5e54ae0cfa, type: 3} + ColorSpace: -1 + BuildPlatform: 42 + GraphicsDevice: 4 + XrSdk: + StereoModes: 0 + Reason: See https://fogbugz.unity3d.com/f/cases/1353315/ + - FilteredScene: {fileID: 0} + FilteredScenes: + - {fileID: 102900000, guid: 0379b72b85eee8045afdaec3b1362957, type: 3} + - {fileID: 102900000, guid: 2744a8931e888734bae7f74874fefdf5, type: 3} + - {fileID: 102900000, guid: 04855e9751809c7488746e5e54ae0cfa, type: 3} + ColorSpace: -1 + BuildPlatform: 43 + GraphicsDevice: 4 + XrSdk: + StereoModes: 0 + Reason: See https://fogbugz.unity3d.com/f/cases/1353315/ From 6db2db37f60a06dc1c70acd4f7ecaf61f48457dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarkko=20Lempi=C3=A4inen?= <79095390+JarkkoUnity@users.noreply.github.com> Date: Wed, 1 Sep 2021 13:29:28 +0300 Subject: [PATCH 009/149] Bugfix 1357740: Black pixels in Fabric material (#5462) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [HDRP] Fix AxF debug output in certain configurations (#4641) * Fix AxF debug output in certain configurations. * Update comment * Fix SSR accumulation white flash (#4648) * Fix white flash * changelog Co-authored-by: sebastienlagarde * Display Info Box when MSAA + ray tracing is onr (#4627) * Show info box when ray tracing is enabled. * Changelog * Move below MSAA Co-authored-by: sebastienlagarde * Fix distortion when resizing the window in player builds with the Graphics Compositor enabled (#4593) Co-authored-by: sebastienlagarde * Add support for the camera bridge in the graphics compositor (#4599) * Fix Jittered Project Matrix Infinite Far Clip Plane (#4638) * Reconstruct jittered projection matrix far plane (for Infinite ) * Changelog Co-authored-by: sebastienlagarde * Fixed a memory leak related to not disposing of the RTAS at the end HDRP's lifecycle. (#4688) Co-authored-by: sebastienlagarde * Fix custom pass utils Blur + Copy overdraw. (#4623) * Fix overdraw in custom pass utils blur function * Updated changelog Co-authored-by: sebastienlagarde * Fix draw procedural invalid pass idx 1 on first template load (#4632) * Fix * changelog * Force sync compilation for TAA Co-authored-by: CifaCia Co-authored-by: sebastienlagarde * Changed light reset to preserve type (#4624) Co-authored-by: sebastienlagarde * Revert "Add support for the camera bridge in the graphics compositor (#4599)" This reverts commit 2325e3fbbcc36a5843af8363234c1a304afd826f. * AxF carpaint: Fix a compilation issue on Vulkan until the cpp HLSLcc side is updated. (case 1335737, related to 1314040) (#4691) Co-authored-by: sebastienlagarde * Revert "Revert "Add support for the camera bridge in the graphics compositor (#4599)"" This reverts commit 30fffd5f7b47ff4e238ba84ee87cafbffc23581a. * revert: Fix distortion when resizing the window in player builds with the Graphi * Fixed the ray traced sub subsurface scattering debug mode not displaying only the RTSSS Data (case 1332904). (#4626) * Fixed the ray traced sub subsurface scattering debug mode not displaying only the RTSSS Data (case 1332904). * Add test scene Co-authored-by: Remi Chapelain Co-authored-by: Sebastien Lagarde * Fix for discrepancies in saturation and intensity between screen space refraction and probe refraction (#4653) * Delete the second transmittance mul * Changelog Co-authored-by: Sebastien Lagarde * Fix a Divide-by-Zero Warning for some Anisotropic Models (Fabric, Lit) (#4636) * Initialize the shading normal to a non-zero value for anisotropy * Changelog Co-authored-by: sebastienlagarde * [HDRP] Fix VfX lit particle AOV output color space (#4646) * Fix VfX lit particle aov output color space * Update comment Co-authored-by: sebastienlagarde * [HDRP][Path Tracing] Fixed transparent unlit (#4605) * Fixed issue with transparent unlit. * Updated changelog. * Reverted accidental change to default mtl. Co-authored-by: sebastienlagarde * Fix distortion with MSAA (#4711) * Fix contact shadow debug views (#4720) * Fix * changelog Co-authored-by: sebastienlagarde * Update Decal-Projector.md (#4695) * [HDRP] Fixed nullref when deleting the texture asset assigned in a local volumetric fog volume (#4728) * Fixed nullref when deleting the 3D mask of a density volume (case 1339330) * Updated changelog Co-authored-by: sebastienlagarde * Fix decal layer enum (#4753) * Fix typo * Fixed reflection probes being injected into the ray tracing light cluster even if not baked (case 1329083). (#4640) Co-authored-by: sebastienlagarde * Ignore hybrid duplicated reflection probes during light baking (#4663) * Ignore hybrid duplicated reflection probes during light baking * test path instead of scene Co-authored-by: sebastienlagarde * Fix double sided option moving when toggling it in the material UI (#4725) * Fix double sided option moving when toggling it in the material UI (case 1328877) * Updated changelog Co-authored-by: sebastienlagarde * Fix formatting * Fix volumetric fog in planar reflections (#4736) * Fix planar reflection * changelog Co-authored-by: sebastienlagarde * Fix motion blur compute dispatch size (#4737) Co-authored-by: sebastienlagarde * - Updated the recursive rendering documentation (case 1338639). (#4759) * - Updated the recursive rendering documentation (case 1338639). * review fixes Co-authored-by: sebastienlagarde * Fix issue with OnDemand directional shadow map being corrupted when reflection probe are updated same frame (#4812) * Don't mark as rendered for reflection probes as we want the cached version to be from main view * Do the thing just for directional * Doc update * changelog Co-authored-by: sebastienlagarde * Fix cropping issue with the compositor camera bridge (#4802) Co-authored-by: sebastienlagarde * Fix for unused resources in depth of field (#4796) * Removing the word Radii from exposure settings (#4854) * Rename in UX * Update docs * [HDRP][Path Tracing] Support for shadow mattes (#4745) * Shadow matte support. * Updated changelog. * Only take occluders into account, closer match to raster mode. * Added test scene. Co-authored-by: sebastienlagarde * Revert "[HDRP][Path Tracing] Support for shadow mattes (#4745)" This reverts commit 85ebbc24ba3ad33926dc5fca2dae7a0d8dde4e2d. * Fixed the transparent cutoff not working properly in semi-transparent and color shadows (case 1340234). (#4756) * Fixed the transparent cutoff not working properly in semi-transparent and color shadows (case 1340234). * Update test ref image Co-authored-by: Remi Chapelain Co-authored-by: sebastienlagarde * Use non jittered projection in outline pass (#4836) Co-authored-by: sebastienlagarde * [HDRP][Path Tracing] Sky settings now properly taken into account when using recorder (#4856) * Make sure sky settings are correctly set when recording. * Updated changelog. Co-authored-by: sebastienlagarde * Fix Resolution Issues for Physically Based Depth of Field (#4848) * Add the necesarry texture coordinate clamping for RTHandle for color pyramid sampling * Add some resolution independence, fitted for 1920x1080 * Changelog * Switch back to point sampling from trilinear, with commentary * Update test reference images * Small correction to the point sampling, always sample mip 0. * Re-update the test images, for mip 0 color sampling * Use a simpler UV scaling/clamping since we are now point sampling. Co-authored-by: sebastienlagarde * Fixed bug introduced by sky-for-recorder support. (#4906) * [Fogbugz 1341576] Memory leaks when the player is paused, and the user changes pipeline… (#4845) * Memory leaks when the player is paused, and the user changes pipeline settings * changelog * [HDRP] Fixed shadergraph double save (#4916) * Don't need to save twice shadergraph the first time we create a graph * Updated changelog * Write 0 instead of micro sized motion vectors + fix extremely fast velocities (#4820) * Kill micromovements. * Do same for camera * Debug view update * Changelog * Remove unnecessary comment * Fix excessive velocity end up marked as no velocity Co-authored-by: sebastienlagarde * [HDRP] Fix material upgrader (#4821) * Fix HDRP material upgrade failing when there is a texture inside the builtin resources assigned in the material * Updated changelog Co-authored-by: sebastienlagarde * [HDRP] Fix custom pass volume not executed in scene view (#4860) * Fix custom pass volume not executed in scene view because of the volume culling mask * Updated changelog Co-authored-by: sebastienlagarde * Fix reflection probe tootltip (#4890) Co-authored-by: sebastienlagarde * Updated the Physically Based Sky documentation for baked lights (#4891) * Updated the Physically Based Sky documentation for baked lights * Rewrite Co-authored-by: sebastienlagarde * Fixed remapping of depth pyramid debug (#4893) * Fixed remapping of depth pyramid debug * Removed debug pragma * Update changelog * Updated tooltip * Fix wobble-like (or tearing-like) SSAO issues when temporal reprojection is enabled. (#4895) * Fix AO perceived wobble * changelog Co-authored-by: sebastienlagarde * Fix Asymmetric Projection Matrices and Fog / Pathtracing (#4926) * Check for asymmetric projections and choose the generic path if so. * Fix asymmetric projections for the pathtracer ray generation. * Changelog * Simplify the matrix multiplication for computing the generic matrix. Co-authored-by: sebastienlagarde * Revert: Fix wobble-like (or tearing-like) SSAO issues when temporal reprojection… * Fix GBuffer depth debug mode (#5054) * Fixed Volume Gizmo size when rescaling parent GameObject (#4915) * Fix Vertex Color Mode documentation (#4976) * Fix wobble-like (or tearing-like) SSAO issues when temporal reprojection is enabled. (#4986) * Fix AO perceived wobble * changelog * Update screenshots Co-authored-by: sebastienlagarde * Fix formatting in NestedOverrideCameraRendering * [HDRP] Fix white flash with SSR when resetting camera history (#5089) * Fix white flash with SSR when resetting camera history * Move branch login inside GetPreviousExposureTexture * Fix for fixed exposure * [Fobguz # 1348357] VFX Particle templates missing stencil flags (#5080) * Adding missing macro for stencil flags in particle forward shaders. This will let flags like TAA Reject be useful * Changelog * Fix object disappearing from lookdev (#5063) * Fixed objects disappearing from Lookdev window when entering playmode (case 1309368). * Updated changelog * Added hideflags in Lookdev context * [HDRP] Fix render object after taa jittering (#5088) * Add a pass after TAA to restore non jittered matrices * updated changelog Co-authored-by: sebastienlagarde * Fix GC alloc in hd/bugfix branch (#5134) * Fixed GC alloc on hd/bugfix branch * Fix GC alloc again * Fix refraction tile artifacts near reflection probe edges (#4727) * Pick the right probe at object center instead of tile granularity. * changelog * Missing commit * Move stuff in lightloop and out of prelightData * Update LightLoop.hlsl * Formatting Co-authored-by: sebastienlagarde * Fix camera rotation uncontrollable with low framerate (#5076) * Fix camera rotation uncontrollable with low framerate. * updated changelog * Clearing out render targets and randmo write targets on pipeline destruction (#5176) Changelog Co-authored-by: sebastienlagarde * Fixed a null ref exception when adding a new environment to the library. (#5131) * Fixed a null ref exception when adding a new environment to the library. * Update changelog Co-authored-by: sebastienlagarde * FogBugz#1348462 - Wait for accessing the HDProjectSettings instance as it was before. (#5141) * Fix nullref in volume system after deleting a volume object (#5161) * Fix nullref in volume system after deleting a volume object (case 1348374) * Updated changelog Co-authored-by: sebastienlagarde * [HDRP] Fix APV UI loosing focus when changing a param (#5219) * Fixed the APV UI losing focus when the helpbox about baking appears in the probe volume. * Small changes (#5220) * Fix update order in Graphics Compositor causing jumpy camera updates (#5235) * Prevent material from having infinite intensity (#5132) * Prevent material from having infinite intensity * Fix switching from ldr to hdr emissive * Fix input field precision * Round the max value * Make two variables Co-authored-by: sebastienlagarde * [HDRP] Adding limitations of decal emissive positive contribution to the documentation (#5237) * Add emissive positive contribution limitation to the doc * changelog * Update CHANGELOG.md * Update Decal-Projector.md * Update Decal-Shader.md Co-authored-by: sebastienlagarde * [HDRP] Fix issue with path tracing when switching between non-persistent cameras (#5246) * Fix issue with path traceing accumulation when switching between cameras. * Check if camera history is persistent Co-authored-by: sebastienlagarde * removed undesired files * Fix log base (#5260) * [HDRP] Fixed mask value stored by the LayerMaskParameter class (#5250) * Fixed value stored by the layer mask parameter class. * Updated changelog. Co-authored-by: sebastienlagarde * [HDRP][DXR] Make vertex color default to 1.0 instead of 0.0 (#5268) * When raytracing, make vertex color default to white if not present. * Updated Changelog. * Added comment. * Fix issue with 0-sized dispatch with extremely low resolutions (#5272) * Ceil to int instead. * changelog * [HDRP] Fix incorrect light list indexing when TAA is enabled (#5287) * Fix incorrect light list indexing when TAA is enabled * Better handle XR Co-authored-by: sebastienlagarde * Fix incorrect additiona velocity for alembic (#5304) * Fixed LUT initialization in Wireframe mode (#5156) Co-authored-by: sebastienlagarde * [HDRP] [LightExplorer] Fix missing refreshwhen editing property with a running paused editor. (#5321) * Update HDLightExplorerExtension.cs * Update CHANGELOG.md * Changed Ambient Mode to Dynamic by default (#5350) * Visual Environment component ambient mode now defaults to Dynamic. * Update changelog * Updated test scene with correct ambient mode after the change * Missing files * Last scene fix * Hd/fix framesettings ordering (#5323) * Fix strange entry in the FrameSettings and add comments for better readability * Update CHANGELOG.md Co-authored-by: JulienIgnace-Unity * Bugfix 1357311: Fixed old ray tracing material conversion (#5364) * - fixed crash in material conversion where material used old raytracing render queue (3900) * - changelog update # Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md * Bugfix 1358480: Fixed missing tooltip for "Tessellation Mode" (#5365) * - fixed missing "Tessellation Mode" tooltip * - update changelog * - updated "Tessellation Mode" tooltip Co-authored-by: sebastienlagarde * [HDRP] Fix HD template (particularly visible in path tracing) (#5319) * Made the 3 light bulbs non shadow-casting. * Revert "Made the 3 light bulbs non shadow-casting." This reverts commit f32ba7d9f4f4c838b3a9cfa641dd13867e5b19c3. * Changed bulb prefab (shadow caster off). * Revert: Changed Ambient Mode to Dynamic by default #5350 * - added saturation for AO & smoothness strength input for ThreadMapDetail subgraph * - updated changelog Co-authored-by: Pavlos Mavridis Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: sebastienlagarde Co-authored-by: John Parsaie Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Antoine Lelievre Co-authored-by: CifaCia Co-authored-by: Adrien de Tocqueville Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Remi Chapelain Co-authored-by: Emmanuel Turquin Co-authored-by: Adrian1066 <44636759+Adrian1066@users.noreply.github.com> Co-authored-by: Kleber Garcia Co-authored-by: Julien Ignace Co-authored-by: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com> Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com> --- .../CHANGELOG.md | 1 + .../ShaderGraph/CottonWool.shadergraph | 543 ++++++++++++------ .../Subgraph/ThreadMapDetail.shadersubgraph | 524 ++++++++++++----- 3 files changed, 747 insertions(+), 321 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 8ee90654455..bce874029b5 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -381,6 +381,7 @@ The version number for this package has increased due to a version update of a r - Fixed lens flare not rendering correctly with TAAU or DLSS. - Fixed case where the SceneView don't refresh when using LightExplorer with a running and Paused game (1354129) - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) +- Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. - Fixed impossibility to release the cursor in the template. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph index eaef33b6743..a1aee2a67ce 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "ce817203cf2f49deb0e8a0e7906e540a", "m_Properties": [ @@ -65,6 +65,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "194f433c869e4a7c8d18b944bcd377eb" + } + ], "m_Nodes": [ { "m_Id": "a30d806aeb7442ef90a1c55ac396158d" @@ -969,10 +975,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "HDRP/Fabric", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "" }, @@ -1002,8 +1010,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 0, "m_DOTSInstancing": false, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, "m_Version": 0, - "m_FirstTimeMigrationExecuted": false, "inspectorFoldoutMask": 0 } @@ -1014,10 +1030,10 @@ "m_Id": 0, "m_DisplayName": "Fuzz Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -1027,10 +1043,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1045,7 +1061,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -1089,6 +1104,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1104,7 +1120,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1130,7 +1145,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1149,18 +1163,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "122033f1a8ce4b64818792c11eb12a18", "m_Guid": { "m_GuidSerialized": "20e6cb1b-65c8-48b6-a376-0c8f32173b2b" }, "m_Name": "Smoothness Max", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_9114DBE7", "m_OverrideReferenceName": "_SmoothnessMax", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -1177,7 +1196,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1226,7 +1244,6 @@ "m_Id": 0, "m_DisplayName": "Thread UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1277,24 +1294,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "161cc5794e934d5394d6ceda9f487e6a", "m_Guid": { "m_GuidSerialized": "f8a95274-456d-419f-82b1-e52bb3f612aa" }, "m_Name": "Fuzz Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D620EF89", "m_OverrideReferenceName": "_FuzzStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -1311,7 +1334,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1353,6 +1375,75 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "194f433c869e4a7c8d18b944bcd377eb", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "53defc4e1cc84dd4aa5821c89a00ebba" + }, + { + "m_Id": "8f36eebfd6044e9ca9b6c3af4cb85d4b" + }, + { + "m_Id": "b913c909284e42c69b25c22a5afeeea7" + }, + { + "m_Id": "de6481523c854147bf8875348269ab9d" + }, + { + "m_Id": "3bc7938d8f7e4a6e96b164434158c6fe" + }, + { + "m_Id": "8b8ec79dc2c84c399cc68e2e9a166d2f" + }, + { + "m_Id": "122033f1a8ce4b64818792c11eb12a18" + }, + { + "m_Id": "eda4287078aa4eeab18123c92af18c38" + }, + { + "m_Id": "ebb8a00747ee4526883203ce0f67e4d2" + }, + { + "m_Id": "f53c87cf9be543ac94bef807bb27d7d9" + }, + { + "m_Id": "e186668b62194e1bb56ca6583f3c6d05" + }, + { + "m_Id": "453f5d72d7964869b1ef2bb166a27f9c" + }, + { + "m_Id": "e8e87a55b75b483bab7dddfb91cb579e" + }, + { + "m_Id": "4eb87c51b5ee4a9bb59be3c5d8a64a63" + }, + { + "m_Id": "1ae40d83102e49a38f87de214fe67251" + }, + { + "m_Id": "d53004b3d1de427892c6b4305ecc5f4e" + }, + { + "m_Id": "438898c6355f45649907d3528df133ab" + }, + { + "m_Id": "c2b02b000d9f49c5a76f119fa54eb852" + }, + { + "m_Id": "25d90b77900a4dcb8587f0c051f3774c" + }, + { + "m_Id": "161cc5794e934d5394d6ceda9f487e6a" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -1365,18 +1456,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "1ae40d83102e49a38f87de214fe67251", "m_Guid": { "m_GuidSerialized": "82f9de41-76a1-430f-b16c-4a1f51d25ca3" }, "m_Name": "Thread AO Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_9106E3BE", "m_OverrideReferenceName": "_ThreadAOStrength01", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -1393,7 +1489,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1430,6 +1525,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1443,7 +1539,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1469,7 +1564,6 @@ "m_Id": 3, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AmbientOcclusion", "m_StageCapability": 2, @@ -1485,10 +1579,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1503,7 +1597,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1532,7 +1625,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1581,7 +1673,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1599,7 +1690,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1611,18 +1701,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "25d90b77900a4dcb8587f0c051f3774c", "m_Guid": { "m_GuidSerialized": "a80c79f0-8441-45c7-b463-153e6543acc0" }, "m_Name": "Fuzz Map UV scale", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D2266F29", "m_OverrideReferenceName": "_FuzzMapUVScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.10000000149011612, "m_FloatType": 0, @@ -1650,7 +1745,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1695,6 +1789,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1708,7 +1803,6 @@ "m_Id": 211825253, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Alpha", "m_StageCapability": 2, @@ -1724,10 +1818,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1742,7 +1836,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -1779,6 +1872,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1794,7 +1888,7 @@ "m_Group": { "m_Id": "2111a9a336ce494eb26c0b79a8a353ea" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -1807,18 +1901,19 @@ }, "m_Slots": [ { - "m_Id": "4fab0ae0addb48418f9e66f5c2150efe" + "m_Id": "9a2dd6017bd54b7a9b89281506dd3407" }, { - "m_Id": "8d91ae62c6ab48c8adccf050f7f200ca" + "m_Id": "4fab0ae0addb48418f9e66f5c2150efe" }, { - "m_Id": "9a2dd6017bd54b7a9b89281506dd3407" + "m_Id": "8d91ae62c6ab48c8adccf050f7f200ca" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1830,7 +1925,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -1840,7 +1937,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1877,7 +1973,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1926,7 +2021,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1944,7 +2038,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1988,6 +2081,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2028,6 +2122,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2080,11 +2175,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2095,16 +2192,23 @@ "m_GuidSerialized": "15bb43f0-03a1-4450-a37c-6842998d4b12" }, "m_Name": "Mask Map _(R) AO(G) _(B) S(A)", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_FCEF774B", "m_OverrideReferenceName": "_MaskMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -2116,7 +2220,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2131,7 +2234,6 @@ "m_Id": 0, "m_DisplayName": "Fuzz Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2149,7 +2251,7 @@ "m_Group": { "m_Id": "5f4bba1e4db24265aa727f4f17c17d83" }, - "m_Name": "Thread Map Detail", + "m_Name": "ThreadMapDetail", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -2161,6 +2263,9 @@ } }, "m_Slots": [ + { + "m_Id": "fd23384d62374c0fb426ece108990f2e" + }, { "m_Id": "ada81cdd8704436ab054a79eefe49386" }, @@ -2199,14 +2304,12 @@ }, { "m_Id": "fd2eb988d0974ab3828267bb0c3ce1c8" - }, - { - "m_Id": "fd23384d62374c0fb426ece108990f2e" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2234,7 +2337,9 @@ 1831767174, -2037099335, 42933449 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -2263,6 +2368,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2272,18 +2378,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "438898c6355f45649907d3528df133ab", "m_Guid": { "m_GuidSerialized": "d0b0dba5-2222-4e57-a4bb-63be15c90197" }, "m_Name": "Thread Smoothness Scale", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_ThreadSmoothnessScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -2301,16 +2412,23 @@ "m_GuidSerialized": "7ed7227f-2a2c-4d93-9ca4-8f6beb19b4a1" }, "m_Name": "Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_ThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"cd19c89d4b2f99f439cb28098be331dc\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 2 } @@ -2333,7 +2451,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2358,7 +2475,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2383,7 +2499,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2427,6 +2542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2461,6 +2577,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2495,6 +2612,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2502,18 +2620,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "4eb87c51b5ee4a9bb59be3c5d8a64a63", "m_Guid": { "m_GuidSerialized": "5a824074-5495-4232-8c15-1dc84b351162" }, "m_Name": "Thread UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvThreadST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2530,7 +2653,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -2556,7 +2678,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -2622,11 +2743,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2655,6 +2778,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2687,6 +2811,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2706,6 +2831,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -2761,11 +2887,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2775,7 +2903,6 @@ "m_Id": 0, "m_DisplayName": "Thread Smoothness Scale", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2793,7 +2920,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2812,18 +2938,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "53defc4e1cc84dd4aa5821c89a00ebba", "m_Guid": { "m_GuidSerialized": "590a33bb-fb27-404c-a77e-8d1efad175ba" }, "m_Name": "Base UV Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvBaseMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2871,6 +3002,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2883,7 +3015,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2909,7 +3040,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -2935,7 +3065,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2953,7 +3082,6 @@ "m_Id": -2037099335, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadNormalStrength", "m_StageCapability": 2, @@ -2969,7 +3097,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -3020,6 +3147,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3032,7 +3160,6 @@ "m_Id": 1, "m_DisplayName": "Normal", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 2, @@ -3056,7 +3183,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -3087,7 +3213,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -3116,7 +3241,6 @@ "m_Id": 42933449, "m_DisplayName": "Thread Smoothness Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadSmoothnessStrength", "m_StageCapability": 2, @@ -3136,6 +3260,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -3151,10 +3276,10 @@ "m_Id": 0, "m_DisplayName": "Base Color Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3164,7 +3289,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3201,6 +3325,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3216,7 +3341,6 @@ "m_Id": 1831767174, "m_DisplayName": "Thread AO Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadAOStrength", "m_StageCapability": 2, @@ -3232,7 +3356,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3277,6 +3400,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3292,7 +3416,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -3342,6 +3465,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3355,7 +3479,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -3373,7 +3496,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -3420,6 +3542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3435,7 +3558,6 @@ "m_Id": 0, "m_DisplayName": "Thread UV Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3480,6 +3602,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3495,7 +3618,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3513,7 +3635,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3576,7 +3697,6 @@ "m_Id": 1211659516, "m_DisplayName": "Normals", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Normals", "m_StageCapability": 2, @@ -3600,7 +3720,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3625,7 +3744,6 @@ "m_Id": 0, "m_DisplayName": "Thickness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Thickness", "m_StageCapability": 2, @@ -3655,7 +3773,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3681,7 +3798,6 @@ "m_Id": 0, "m_DisplayName": "Bent Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BentNormal", "m_StageCapability": 2, @@ -3725,6 +3841,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3740,7 +3857,6 @@ "m_Id": 234905224, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Smoothness", "m_StageCapability": 2, @@ -3775,6 +3891,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3790,7 +3907,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -3815,10 +3931,10 @@ "m_Id": 0, "m_DisplayName": "Normal Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3851,7 +3967,8 @@ "m_Id": "00e99dd273634ec9b10f23bfa33b0193" } ], - "m_CustomEditorGUI": "" + "m_CustomEditorGUI": "", + "m_SupportVFX": false } { @@ -3861,7 +3978,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3879,7 +3995,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, @@ -3897,7 +4012,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3916,18 +4030,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8b8ec79dc2c84c399cc68e2e9a166d2f", "m_Guid": { "m_GuidSerialized": "6241710c-4975-4571-8fa6-46028d76ae6f" }, "m_Name": "Smoothness Min", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_137577A6", "m_OverrideReferenceName": "_SmoothnessMin", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 1, @@ -3963,6 +4082,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3976,7 +4096,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4020,24 +4139,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "8f36eebfd6044e9ca9b6c3af4cb85d4b", "m_Guid": { "m_GuidSerialized": "091eb6ce-7f90-4578-b7dc-656f785f6aa3" }, "m_Name": "Base UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvBaseST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -4054,7 +4179,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -4080,7 +4204,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -4098,7 +4221,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4147,7 +4269,6 @@ "m_Id": 0, "m_DisplayName": "Normal Map Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4165,7 +4286,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4191,7 +4311,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4216,7 +4335,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -4232,7 +4350,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4257,7 +4374,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -4283,7 +4399,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4309,7 +4424,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -4353,6 +4467,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4368,7 +4483,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -4386,7 +4500,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -4430,6 +4543,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4470,6 +4584,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4482,7 +4597,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -4507,10 +4621,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4520,7 +4634,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4598,6 +4711,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4611,10 +4725,10 @@ "m_Id": -182820338, "m_DisplayName": "ThreadMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadMap", "m_StageCapability": 2, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -4648,6 +4762,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4661,7 +4776,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Specular", "m_StageCapability": 2, @@ -4711,6 +4825,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4726,10 +4841,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4767,6 +4882,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4780,16 +4896,23 @@ "m_GuidSerialized": "59a67fb1-9bc9-44a2-bdf1-3020f0477029" }, "m_Name": "Base Color Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_BaseColorMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -4801,7 +4924,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4826,7 +4948,6 @@ "m_Id": 0, "m_DisplayName": "Thread AO Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4844,7 +4965,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -4888,6 +5008,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4903,7 +5024,6 @@ "m_Id": 2, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -4920,16 +5040,23 @@ "m_GuidSerialized": "e40cc53d-76bf-4c64-b873-35605e3df332" }, "m_Name": "Fuzz Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_CBF24C60", "m_OverrideReferenceName": "_FuzzMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 1 } @@ -4941,7 +5068,6 @@ "m_Id": 0, "m_DisplayName": "Subsurface Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SubsurfaceMask", "m_StageCapability": 2, @@ -4957,10 +5083,10 @@ "m_Id": 0, "m_DisplayName": "Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4970,7 +5096,6 @@ "m_Id": 0, "m_DisplayName": "Diffusion Profile", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "DiffusionProfileHash", "m_StageCapability": 2, @@ -4992,7 +5117,7 @@ "m_Group": { "m_Id": "d7ca40dc9c4c4decb3aee4622cb88552" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -5005,18 +5130,19 @@ }, "m_Slots": [ { - "m_Id": "5915f6ae181a4399b797b9e24c3c1ad7" + "m_Id": "4f2560ddd60c46e7bb92072a9d655860" }, { - "m_Id": "e02e1c20f1234df8b72a0cc7137a40bc" + "m_Id": "5915f6ae181a4399b797b9e24c3c1ad7" }, { - "m_Id": "4f2560ddd60c46e7bb92072a9d655860" + "m_Id": "e02e1c20f1234df8b72a0cc7137a40bc" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5028,7 +5154,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -5038,7 +5166,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -5063,7 +5190,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5081,7 +5207,6 @@ "m_Id": -1709975888, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 2, @@ -5103,7 +5228,6 @@ "m_Id": 0, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5140,6 +5264,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5155,7 +5280,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5173,7 +5297,6 @@ "m_Id": 1705060832, "m_DisplayName": "AmbientOcclusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_AmbientOcclusion", "m_StageCapability": 2, @@ -5189,7 +5312,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5257,6 +5379,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5294,6 +5417,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5325,6 +5449,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5338,10 +5463,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -5351,7 +5476,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5394,6 +5518,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5429,6 +5554,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5467,6 +5593,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5479,7 +5606,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -5522,18 +5648,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "d53004b3d1de427892c6b4305ecc5f4e", "m_Guid": { "m_GuidSerialized": "9241d5b7-4111-4f70-984b-60e5019fae48" }, "m_Name": "Thread Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_F3D27F0A", "m_OverrideReferenceName": "_ThreadNormalStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -5550,7 +5681,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5615,11 +5745,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 1, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -5640,7 +5772,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -5660,18 +5791,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "de6481523c854147bf8875348269ab9d", "m_Guid": { "m_GuidSerialized": "7b882733-7502-4fe2-aafe-6dc24de49027" }, "m_Name": "Base Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.729411780834198, @@ -5679,6 +5815,7 @@ "b": 0.729411780834198, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -5708,6 +5845,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5721,7 +5859,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -5739,7 +5876,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5764,7 +5900,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5792,7 +5927,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -5815,11 +5949,16 @@ "m_GuidSerialized": "dd9abbb7-9633-411e-91d0-5ba041ed0dda" }, "m_Name": "Use Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_useThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } @@ -5843,8 +5982,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 3, "m_DOTSInstancing": false, - "m_Version": 0, - "m_FirstTimeMigrationExecuted": true, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, + "m_Version": 1, "inspectorFoldoutMask": 0 } @@ -5855,7 +6002,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5873,7 +6019,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5885,18 +6030,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "e8e87a55b75b483bab7dddfb91cb579e", "m_Guid": { "m_GuidSerialized": "fa389c8d-1de4-4353-9a23-8b805cacb9c3" }, "m_Name": "Thread UV Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvThreadMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -5920,16 +6070,23 @@ "m_GuidSerialized": "eb361664-caaf-41a1-ad6f-fc9ef43c1320" }, "m_Name": "Normal Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_NormalMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 3 } @@ -5941,7 +6098,6 @@ "m_Id": 0, "m_DisplayName": "Fuzz Map UV scale", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5959,7 +6115,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -6003,6 +6158,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6034,6 +6190,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6041,18 +6198,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "eda4287078aa4eeab18123c92af18c38", "m_Guid": { "m_GuidSerialized": "28adbd46-38a3-41f0-bcce-a40e1be0681d" }, "m_Name": "Specular Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_265C63FA", "m_OverrideReferenceName": "_SpecularColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.20000000298023225, @@ -6060,6 +6222,7 @@ "b": 0.20000000298023225, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -6070,10 +6233,10 @@ "m_Id": 0, "m_DisplayName": "Mask Map _(R) AO(G) _(B) S(A)", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6083,7 +6246,6 @@ "m_Id": 2, "m_DisplayName": "Y", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, @@ -6120,6 +6282,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6133,7 +6296,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -6152,18 +6314,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f53c87cf9be543ac94bef807bb27d7d9", "m_Guid": { "m_GuidSerialized": "a4bfd223-86d7-44f5-bf1f-20b3b0471610" }, "m_Name": "Normal Map Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_B81BC5DC", "m_OverrideReferenceName": "_NormalMapStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -6180,10 +6347,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6193,7 +6360,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -6209,7 +6375,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -6227,10 +6392,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -6245,7 +6410,6 @@ "m_Id": 235535200, "m_DisplayName": "Use Thread Map", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_UseThreadMap", "m_StageCapability": 2, @@ -6260,7 +6424,6 @@ "m_Id": 4, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -6276,7 +6439,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Min", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6313,6 +6475,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6345,6 +6508,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6360,7 +6524,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Max", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph index d93f23d67d7..c4f85bf0570 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "65578d680ef541edb3cfa33ddccc4d96", "m_Properties": [ @@ -35,6 +35,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "3b660f14f3b84803bdadc345e9225a0c" + } + ], "m_Nodes": [ { "m_Id": "487dae965da64ea38851394bac98ba3a" @@ -131,6 +137,12 @@ }, { "m_Id": "bfbb4fe1c5a2428ea2ccabb8297376e7" + }, + { + "m_Id": "c033d4389cf54046bf7a711bb51beb07" + }, + { + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" } ], "m_GroupDatas": [ @@ -172,9 +184,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "e57586dd10374a24bf68ee68d251a0af" + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -494,9 +506,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "25f8257d5a1645e991c837532a642f48" + "m_Id": "c033d4389cf54046bf7a711bb51beb07" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -583,6 +595,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c033d4389cf54046bf7a711bb51beb07" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25f8257d5a1645e991c837532a642f48" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -625,6 +651,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e57586dd10374a24bf68ee68d251a0af" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -672,10 +712,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Utility/High Definition Render Pipeline/Fabric", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "86bcf008f4934ed7a96b70a34f420629" }, @@ -689,7 +731,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -714,7 +755,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -761,6 +801,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -773,7 +814,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -791,7 +831,6 @@ "m_Id": 1, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 2, @@ -812,6 +851,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0d1a99acdbbd48e1a8500c722187ded9", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -824,9 +887,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -458.0, - "y": 360.0, - "width": 215.0, + "x": -668.0, + "y": 364.0, + "width": 229.0, "height": 34.0 } }, @@ -838,6 +901,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -853,7 +917,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -878,7 +941,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -903,7 +965,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -928,7 +989,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -954,7 +1014,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -972,7 +1031,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1043,6 +1101,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1056,7 +1115,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1074,7 +1132,6 @@ "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1100,16 +1157,23 @@ "m_GuidSerialized": "110f2c7b-3415-4e1f-b153-d0756fef216a" }, "m_Name": "ThreadMap", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_4013167B", "m_OverrideReferenceName": "_ThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 2 } @@ -1126,9 +1190,9 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -151.0, - "y": 559.0, - "width": 121.0, + "x": -66.0, + "y": 561.0, + "width": 126.0, "height": 118.0 } }, @@ -1149,6 +1213,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1161,7 +1226,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1187,7 +1251,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -1224,6 +1287,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1239,7 +1303,6 @@ "m_Id": 0, "m_DisplayName": "Normals", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1267,7 +1330,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1317,6 +1379,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1330,7 +1393,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1386,6 +1448,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1417,6 +1480,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1432,7 +1496,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1457,7 +1520,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1476,18 +1538,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", "m_ObjectId": "385d0ecc6bcf4bdbb09efd22de620f42", "m_Guid": { "m_GuidSerialized": "0cfe9596-beed-43cb-a7c1-28df7483f9ed" }, "m_Name": "UV", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector2_18BA5697", "m_OverrideReferenceName": "_UV", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -1504,7 +1571,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -1533,6 +1599,45 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "3b660f14f3b84803bdadc345e9225a0c", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "d9eb3340d6c6418989b4be944c61af31" + }, + { + "m_Id": "2312588c3c904cac9b599d16d8ed91d3" + }, + { + "m_Id": "385d0ecc6bcf4bdbb09efd22de620f42" + }, + { + "m_Id": "7e4daf60ec4f46009ba214691bfdee5b" + }, + { + "m_Id": "8ff38c629a0a408db9cb7db4cf4fa83a" + }, + { + "m_Id": "523c1af3d19d4e4a9818d69c311e0e3e" + }, + { + "m_Id": "90e7bc402411450eb4c585e2d52e7ae5" + }, + { + "m_Id": "4eef33670c92444f9b9b2537fa9620c1" + }, + { + "m_Id": "b5587cfc8ee94bf8aec4c4ae1e963732" + }, + { + "m_Id": "8c73e6e056a44794bf26b1f9ccc0f8a9" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -1565,6 +1670,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1577,7 +1683,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -1592,7 +1697,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1607,7 +1711,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1637,9 +1740,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -149.0, - "y": 697.0, - "width": 162.0, + "x": -64.0, + "y": 699.0, + "width": 170.0, "height": 34.0 } }, @@ -1651,6 +1754,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1666,7 +1770,6 @@ "m_Id": 0, "m_DisplayName": "Thread Smoothness Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1703,6 +1806,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1758,11 +1862,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -1772,7 +1878,6 @@ "m_Id": 0, "m_DisplayName": "Thread AO Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1790,7 +1895,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1815,7 +1919,6 @@ "m_Id": 3, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AmbientOcclusion", "m_StageCapability": 2, @@ -1833,7 +1936,6 @@ "m_Id": 3, "m_DisplayName": "Z", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Z", "m_StageCapability": 3, @@ -1845,18 +1947,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "4eef33670c92444f9b9b2537fa9620c1", "m_Guid": { "m_GuidSerialized": "d935cf22-0a1b-43f1-b1fa-be9764d04755" }, "m_Name": "Thread AO Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_2870F26B", "m_OverrideReferenceName": "_ThreadAOStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -1873,7 +1980,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1892,18 +1998,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "523c1af3d19d4e4a9818d69c311e0e3e", "m_Guid": { "m_GuidSerialized": "fc9b7ab9-d83b-4887-a555-28692897d85b" }, "m_Name": "Alpha", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_61CD5374", "m_OverrideReferenceName": "_Alpha", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 0, @@ -1939,6 +2050,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1954,7 +2066,6 @@ "m_Id": 0, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1972,7 +2083,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2000,7 +2110,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2021,6 +2130,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5ffc0b3bc6b64a2b83a785101fb32c19", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalizeNode", @@ -2050,6 +2183,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2062,7 +2196,6 @@ "m_Id": 2, "m_DisplayName": "Y", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, @@ -2080,7 +2213,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -2105,10 +2237,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2118,7 +2250,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2146,7 +2277,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2171,7 +2301,6 @@ "m_Id": 0, "m_DisplayName": "AmbientOcclusion", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2189,7 +2318,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2214,7 +2342,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -2237,9 +2364,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 24.0, - "y": 565.0, - "width": 122.0, + "x": 109.0, + "y": 567.0, + "width": 126.0, "height": 118.0 } }, @@ -2257,6 +2384,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2288,6 +2416,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2303,7 +2432,6 @@ "m_Id": 0, "m_DisplayName": "Normals", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2325,18 +2453,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", "m_ObjectId": "7e4daf60ec4f46009ba214691bfdee5b", "m_Guid": { "m_GuidSerialized": "fa1b3334-3023-478f-8d87-82bcdec6ab47" }, "m_Name": "Normals", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector3_AFFB47E5", "m_OverrideReferenceName": "_Normals", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.5, @@ -2353,7 +2486,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2378,7 +2510,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -2425,6 +2556,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2437,7 +2569,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2490,6 +2621,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2507,9 +2639,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 103.0, - "y": 507.0, - "width": 149.0, + "x": 188.0, + "y": 509.0, + "width": 164.0, "height": 34.0 } }, @@ -2521,6 +2653,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2536,7 +2669,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2561,7 +2693,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2584,9 +2715,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -361.0, - "y": 623.0, - "width": 171.0, + "x": -469.0, + "y": 615.0, + "width": 180.0, "height": 34.0 } }, @@ -2598,6 +2729,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2641,6 +2773,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2654,7 +2787,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2679,7 +2811,6 @@ "m_Id": 2, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -2691,18 +2822,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8c73e6e056a44794bf26b1f9ccc0f8a9", "m_Guid": { "m_GuidSerialized": "24ff54bf-3f70-4881-aded-191bd20052f7" }, "m_Name": "Thread Smoothness Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D5B952A7", "m_OverrideReferenceName": "_ThreadSmoothnessStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -2725,9 +2861,9 @@ "m_Position": { "serializedVersion": "2", "x": -439.0, - "y": 248.0, - "width": 124.0, - "height": 94.0 + "y": 212.0, + "width": 128.0, + "height": 93.0 } }, "m_Slots": [ @@ -2747,24 +2883,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8ff38c629a0a408db9cb7db4cf4fa83a", "m_Guid": { "m_GuidSerialized": "f4d01d77-ecd0-43d5-9ed6-16cf78e4612a" }, "m_Name": "Smoothness", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_34701477", "m_OverrideReferenceName": "_Smoothness", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 0, @@ -2781,7 +2923,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -2800,18 +2941,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "90e7bc402411450eb4c585e2d52e7ae5", "m_Guid": { "m_GuidSerialized": "d2df6573-0f7e-4c62-b020-b8e4bbdae1f1" }, "m_Name": "AmbientOcclusion", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_BF2B2008", "m_OverrideReferenceName": "_AmbientOcclusion", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 0, @@ -2828,7 +2974,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2877,10 +3022,10 @@ "m_Id": 0, "m_DisplayName": "ThreadMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2890,7 +3035,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2958,6 +3102,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2998,6 +3143,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3010,7 +3156,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3038,7 +3183,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3066,7 +3210,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3090,8 +3233,32 @@ "m_ObjectId": "addd02d1c7c840c0982f4a1a282501cb", "m_Title": "Ambient Occlusion", "m_Position": { - "x": -386.0, - "y": 445.0 + "x": -470.0, + "y": 450.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ae7f3eee64784528a019124a5c8760f0", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 } } @@ -3102,7 +3269,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -3146,6 +3312,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3155,18 +3322,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "b5587cfc8ee94bf8aec4c4ae1e963732", "m_Guid": { "m_GuidSerialized": "e96918ee-3bfd-4c51-b6d2-54b34d9ad706" }, "m_Name": "Thread Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_3DE8C8A3", "m_OverrideReferenceName": "_ThreadNormalStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -3183,7 +3355,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3227,6 +3398,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3261,6 +3433,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3269,6 +3442,43 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "c033d4389cf54046bf7a711bb51beb07", + "m_Group": { + "m_Id": "addd02d1c7c840c0982f4a1a282501cb" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -254.0, + "y": 615.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "5ffc0b3bc6b64a2b83a785101fb32c19" + }, + { + "m_Id": "eb23ee3850ff403d967c4078d85e27de" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -3287,7 +3497,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3355,6 +3564,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3370,7 +3580,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3388,7 +3597,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3403,7 +3611,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3439,7 +3646,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -3464,7 +3670,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3492,7 +3697,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3517,7 +3721,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3567,11 +3770,16 @@ "m_GuidSerialized": "d6aaba38-49a3-41d1-8163-914932324589" }, "m_Name": "Use Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Boolean_AA2071D6", "m_OverrideReferenceName": "_UseThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } @@ -3611,6 +3819,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3628,7 +3837,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3654,7 +3862,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3704,6 +3911,44 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "de0d06640c6d43fcbe91127b77ce92e3", + "m_Group": { + "m_Id": "3afed62abb5b4810a8359bbc547f9686" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -425.0, + "y": 325.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "0d1a99acdbbd48e1a8500c722187ded9" + }, + { + "m_Id": "ae7f3eee64784528a019124a5c8760f0" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3716,7 +3961,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -3734,7 +3978,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3811,11 +4054,36 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "eb23ee3850ff403d967c4078d85e27de", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3823,7 +4091,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -3848,7 +4115,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -3863,7 +4129,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -3878,7 +4143,6 @@ "m_Id": 4, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -3896,7 +4160,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3911,10 +4174,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -3934,9 +4197,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 265.0, - "y": 565.0, - "width": 161.0, + "x": 350.0, + "y": 567.0, + "width": 170.0, "height": 142.0 } }, @@ -3957,6 +4220,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3969,7 +4233,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -3994,7 +4257,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, From d49cd06e82e349f0b2acc7bf47fab5d2c6923699 Mon Sep 17 00:00:00 2001 From: Emmanuel Turquin Date: Wed, 1 Sep 2021 12:33:52 +0200 Subject: [PATCH 010/149] Removed temp fix for vertex color in ray tracing. (#5445) --- .../Raytracing/Shaders/RaytracingIntersection.hlsl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl index efeb11e68f2..16584f22b96 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl @@ -105,11 +105,6 @@ void FetchIntersectionVertex(uint vertexIndex, out IntersectionVertex outVertex) #ifdef ATTRIBUTES_NEED_COLOR outVertex.color = UnityRayTracingFetchVertexAttribute4(vertexIndex, kVertexAttributeColor); - // We want to default to white in case there is no specified color, to match the raster behaviour - // FIXME: This could be addressed in UnityRayTracingFetchVertexAttribute4(), but until then we use this workaround - if (!any(outVertex.color)) - outVertex.color = 1.0; - #else outVertex.color = 0.0; #endif From f4cb5c90b2006fb1680bb90a8125292476667d47 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Wed, 1 Sep 2021 12:39:29 +0200 Subject: [PATCH 011/149] Fix APV error on first time it is enabled and improve debug probe perf by 2x (#5423) * Cleanup only when initialized. * changelog * More decimated sphere * Changelog * Move init check inside Co-authored-by: sebastienlagarde --- .../ProbeVolume/ProbeReferenceVolume.cs | 3 + .../CHANGELOG.md | 2 + .../HDRenderPipelineRuntimeResources.asset | 55 ++++++------------- .../RenderPipelineResources/Mesh/Sphere.fbx | 4 +- .../Mesh/Sphere.fbx.meta | 47 ++++++++++------ 5 files changed, 54 insertions(+), 57 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs index 4d9d800e70b..48d1a256dee 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs @@ -547,6 +547,7 @@ public struct ExtraDataActionInput bool m_NeedLoadAsset = false; bool m_ProbeReferenceVolumeInit = false; + internal bool isInitialized => m_ProbeReferenceVolumeInit; struct InitInfo @@ -645,6 +646,8 @@ internal void ForceSHBand(ProbeVolumeSHBands shBands) /// public void Cleanup() { + if (!m_ProbeReferenceVolumeInit) return; + if (!m_IsInitialized) { Debug.LogError("Probe Volume System has not been initialized first before calling cleanup."); diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index bce874029b5..be1276f3ad9 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -384,6 +384,8 @@ The version number for this package has increased due to a version update of a r - Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. - Fixed impossibility to release the cursor in the template. +- Fixed assert failure when enabling the probe volume system for the first time. +- Significantly improved performance of APV probe debug. ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset index 24542ec74a4..82c7307c4c5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset @@ -77,26 +77,16 @@ MonoBehaviour: physicallyBasedSkyPS: {fileID: 4800000, guid: a06934a4863e778498be65d8f865b7a4, type: 3} planarReflectionFilteringCS: {fileID: 7200000, guid: 9f3f8a01b8caaaa4595591dc96d43dd2, type: 3} cloudLayerPS: {fileID: 4800000, guid: 001a47fa123e95a4bba13ecb0442d944, type: 3} - bakeCloudTextureCS: {fileID: 7200000, guid: 09a7f6850ee9fb4439e5ebd632127da5, - type: 3} - bakeCloudShadowsCS: {fileID: 7200000, guid: 3e7317e0800c066448ee07a3e47f102b, - type: 3} - volumetricCloudsCS: {fileID: 7200000, guid: f911a8577fa9a4546a6b255bcf888baf, - type: 3} - volumetricCloudMapGeneratorCS: {fileID: 7200000, guid: 6b22771f0aa98744cb09f455a5a818cb, - type: 3} - volumetricCloudsCombinePS: {fileID: 4800000, guid: 12f1a69ddf916f042ae6ce8a994506f3, - type: 3} - preIntegratedFGD_GGXDisneyDiffusePS: {fileID: 4800000, guid: 123f13d52852ef547b2962de4bd9eaad, - type: 3} - preIntegratedFGD_CharlieFabricLambertPS: {fileID: 4800000, guid: 3b3bf235775cf8b4baae7f3306787ab0, - type: 3} - preIntegratedFGD_MarschnerPS: {fileID: 4800000, guid: 31f36caf0a5e7f848a1b5328b6ad3eb8, - type: 3} - preIntegratedFGD_WardPS: {fileID: 4800000, guid: d279c46a545b0af4f9f0c4fa82cd489e, - type: 3} - preIntegratedFGD_CookTorrancePS: {fileID: 4800000, guid: a6402c19b020b4a4fb7073aaa2e26aba, - type: 3} + bakeCloudTextureCS: {fileID: 7200000, guid: 09a7f6850ee9fb4439e5ebd632127da5, type: 3} + bakeCloudShadowsCS: {fileID: 7200000, guid: 3e7317e0800c066448ee07a3e47f102b, type: 3} + volumetricCloudsCS: {fileID: 7200000, guid: f911a8577fa9a4546a6b255bcf888baf, type: 3} + volumetricCloudMapGeneratorCS: {fileID: 7200000, guid: 6b22771f0aa98744cb09f455a5a818cb, type: 3} + volumetricCloudsCombinePS: {fileID: 4800000, guid: 12f1a69ddf916f042ae6ce8a994506f3, type: 3} + preIntegratedFGD_GGXDisneyDiffusePS: {fileID: 4800000, guid: 123f13d52852ef547b2962de4bd9eaad, type: 3} + preIntegratedFGD_CharlieFabricLambertPS: {fileID: 4800000, guid: 3b3bf235775cf8b4baae7f3306787ab0, type: 3} + preIntegratedFGD_MarschnerPS: {fileID: 4800000, guid: 31f36caf0a5e7f848a1b5328b6ad3eb8, type: 3} + preIntegratedFGD_WardPS: {fileID: 4800000, guid: d279c46a545b0af4f9f0c4fa82cd489e, type: 3} + preIntegratedFGD_CookTorrancePS: {fileID: 4800000, guid: a6402c19b020b4a4fb7073aaa2e26aba, type: 3} encodeBC6HCS: {fileID: 7200000, guid: aa922d239de60304f964e24488559eeb, type: 3} cubeToPanoPS: {fileID: 4800000, guid: 595434cc3b6405246b6cd3086d0b6f7d, type: 3} blitCubeTextureFacePS: {fileID: 4800000, guid: d850d0a2481878d4bbf17e5126b04163, type: 3} @@ -156,28 +146,21 @@ MonoBehaviour: clearBlackPS: {fileID: 4800000, guid: 3330c1503ea8c6d4d9408df3f64227eb, type: 3} SMAAPS: {fileID: 4800000, guid: 9655f4aa89a469c49aceaceabf9bc77b, type: 3} temporalAntialiasingPS: {fileID: 4800000, guid: 3dd9fd928fdb83743b1f27d15df22179, type: 3} - upsampleSceneCS: {fileID: 7200000, guid: 51e13c18f34ea1d4183edb912e98cbf7, type: 3} lensFlareDataDrivenPS: {fileID: 4800000, guid: 85330b3de0cfebc4ba78b2d61b1a2899, type: 3} DLSSBiasColorMaskPS: {fileID: 4800000, guid: 017a05924c0b0484ca29717ed0c60343, type: 3} dofCircleOfConfusion: {fileID: 7200000, guid: 75332b7b315c80d4babe506820aa0bfd, type: 3} dofGatherCS: {fileID: 7200000, guid: 1e6b16a7970a1494db74b1d3d007d1cc, type: 3} dofCoCMinMaxCS: {fileID: 7200000, guid: c70dd492c3d2fe94589d6ca8d4e37915, type: 3} dofMinMaxDilateCS: {fileID: 7200000, guid: 757a3f81b35177b44b2b178909b49172, type: 3} - contrastAdaptiveSharpenCS: {fileID: 7200000, guid: 560896aec2f412c48995be35551a4ac6, - type: 3} - robustContrastAdaptiveSharpenCS: {fileID: 7200000, guid: d907373e407ff65479c449a66c04443d, - type: 3} - edgeAdaptiveSpatialUpsamplingCS: {fileID: 7200000, guid: f054fa9fe2c85bb42b9489e2f9ffb643, - type: 3} - VTFeedbackDownsample: {fileID: 7200000, guid: 32d963548086c2c439aeb23a93e9a00a, - type: 3} + contrastAdaptiveSharpenCS: {fileID: 7200000, guid: 560896aec2f412c48995be35551a4ac6, type: 3} + robustContrastAdaptiveSharpenCS: {fileID: 7200000, guid: d907373e407ff65479c449a66c04443d, type: 3} + edgeAdaptiveSpatialUpsamplingCS: {fileID: 7200000, guid: f054fa9fe2c85bb42b9489e2f9ffb643, type: 3} + VTFeedbackDownsample: {fileID: 7200000, guid: 32d963548086c2c439aeb23a93e9a00a, type: 3} accumulationCS: {fileID: 7200000, guid: ed80add7a217efa468d137d6f7c668f3, type: 3} alphaInjectionPS: {fileID: 4800000, guid: 4edd96259a5e8b44c90479928f0cd11e, type: 3} chromaKeyingPS: {fileID: 4800000, guid: 49feb6b111e82ec4eb6d3d08e4b6903e, type: 3} customClearPS: {fileID: 4800000, guid: 9cef3686fa32c8840947ed99b561195c, type: 3} - ssGIDenoiserCS: {fileID: 7200000, guid: a435d803bc32d0845ba1a713b7a1c8b1, type: 3} - bilateralUpsampleCS: {fileID: 7200000, guid: 68e831c555284d741b985e05369f0e63, - type: 3} + bilateralUpsampleCS: {fileID: 7200000, guid: 68e831c555284d741b985e05369f0e63, type: 3} temporalFilterCS: {fileID: 7200000, guid: 741979ff70f7bd6489fbcb464280ecff, type: 3} diffuseDenoiserCS: {fileID: 7200000, guid: b4ed2382141619f40af1f743a84ccaea, type: 3} textures: @@ -258,10 +241,8 @@ MonoBehaviour: rankingTile8SPP: {fileID: 2800000, guid: af4bd638a4b3eb14781e6441adcdfbb9, type: 3} scramblingTile8SPP: {fileID: 2800000, guid: 152f8b933250a7b448fc2d4d301b9944, type: 3} rankingTile256SPP: {fileID: 2800000, guid: 1e604a266c415cd46b36d97cd9220aa8, type: 3} - scramblingTile256SPP: {fileID: 2800000, guid: 882fb55d7b3e7c94598a318df9376e32, - type: 3} - preintegratedAzimuthalScattering: {fileID: 2800000, guid: 4f022cc0bdd8db4428a8faae60acb3dc, - type: 3} + scramblingTile256SPP: {fileID: 2800000, guid: 882fb55d7b3e7c94598a318df9376e32, type: 3} + preintegratedAzimuthalScattering: {fileID: 2800000, guid: 4f022cc0bdd8db4428a8faae60acb3dc, type: 3} cloudLutRainAO: {fileID: 2800000, guid: e0bcfddf26ed5584ba3d8b94d3200114, type: 3} worleyNoise128RGBA: {fileID: 11700000, guid: 1fe54a721d0e2504e89f121c723404a8, type: 3} worleyNoise32RGB: {fileID: 11700000, guid: ec156c314a242914dbb706f73ad78cf2, type: 3} @@ -288,5 +269,5 @@ MonoBehaviour: defaultDiffusionProfile: {fileID: 11400000, guid: 2b7005ba3a4d8474b8cdc34141ad766e, type: 2} emissiveCylinderMesh: {fileID: 2534964839176971238, guid: accb6d90f0d50fe4ca0f68159b4323de, type: 3} emissiveQuadMesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} - sphereMesh: {fileID: 4300000, guid: 9e0af751bc36ea146940ba245193e28c, type: 3} + sphereMesh: {fileID: 532591105809680800, guid: f7f013a81640a284ea38df61c509ff9a, type: 3} m_Version: 4 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx index cceb1e76926..a225668ca63 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a68cc8459e0e19ff6ea5eba075edbd0da492df1e0ed43b5a16143986da4f9d7b -size 51632 +oid sha256:696831e63b190731502326c428323eb77bab6dd8fb9285030f6ec6467d49aab4 +size 24092 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta index fb87f7716b2..de4ec0ea6a8 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta @@ -1,17 +1,11 @@ fileFormatVersion: 2 -guid: 9e0af751bc36ea146940ba245193e28c +guid: f7f013a81640a284ea38df61c509ff9a ModelImporter: - serializedVersion: 23 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2100000: No Name - 2300000: //RootNode - 3300000: //RootNode - 4300000: Sphere + serializedVersion: 21202 + internalIDToNameTable: [] externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 2 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -20,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -37,40 +32,53 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - previousCalculatedGlobalScale: 1 - hasPreviousCalculatedGlobalScale: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 0 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -80,14 +88,17 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 additionalBone: 0 userData: assetBundleName: From e557dd923428990314e1688ff559b52f5661e58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vauchelles?= <55485372+fredericv-unity3d@users.noreply.github.com> Date: Wed, 1 Sep 2021 12:58:28 +0200 Subject: [PATCH 012/149] Removed DLSS keyword from settings' search (case 1358409) (#5361) * Removed DLSS keyword from settings' search (case 1358409) * Changed naming * Update CHANGELOG.md Co-authored-by: sebastienlagarde --- .../CHANGELOG.md | 1 + .../Settings/HDGlobalSettingsWindow.cs | 9 ++++++--- .../Settings/QualitySettingsPanel.cs | 9 ++++++--- .../RenderPipelineSettingsUtilities.cs | 19 +++++++++++++++++++ .../RenderPipelineSettingsUtilities.cs.meta | 11 +++++++++++ 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs create mode 100644 com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index be1276f3ad9..032873d1319 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -386,6 +386,7 @@ The version number for this package has increased due to a version update of a r - Fixed impossibility to release the cursor in the template. - Fixed assert failure when enabling the probe volume system for the first time. - Significantly improved performance of APV probe debug. +- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs index 6835576ef2a..1c93bbf4452 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs @@ -21,12 +21,15 @@ class HDGlobalSettingsPanelProvider [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(OverridableFrameSettingsArea.frameSettingsKeywords); + + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords); + return new SettingsProvider("Project/Graphics/HDRP Global Settings", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(OverridableFrameSettingsArea.frameSettingsKeywords) - .ToArray(), + keywords = keywords.ToArray(), guiHandler = s_IMGUIImpl.DoGUI, titleBarGuiHandler = s_IMGUIImpl.OnTitleBarGUI }; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs index cd0825e358c..86a6a9f7b88 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs @@ -23,12 +23,15 @@ class QualitySettingsPanel [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()); + + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords); + return new SettingsProvider("Project/Quality/HDRP", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()) - .ToArray(), + keywords = keywords.ToArray(), guiHandler = s_IMGUIImpl.OnGUI, }; } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs new file mode 100644 index 00000000000..4f3ee51e1cd --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using System.Linq; + +namespace UnityEditor.Rendering.HighDefinition +{ + static class RenderPipelineSettingsUtilities + { + public static IEnumerable RemoveDLSSKeywords(IEnumerable keywords) + { +#if ENABLE_NVIDIA && !ENABLE_NVIDIA_MODULE + // Case 1358409 workaround: + // Remove all DLSS keyword when the NVIDIA package is not installed. + return keywords.Where(keyword => keyword.ToLower().IndexOf("dlss") == -1); +#else + return keywords; +#endif + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta new file mode 100644 index 00000000000..a2101600b25 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90142127598a3854d825d96865206593 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From fef4990704e9e334169a23038a18402c296722a5 Mon Sep 17 00:00:00 2001 From: emilybrown1 <88374601+emilybrown1@users.noreply.github.com> Date: Wed, 1 Sep 2021 11:59:10 +0100 Subject: [PATCH 013/149] Clarified lists and removed unnecessary bold (#5403) * Clarified lists and removed unnecessary bold * Update Override-Volumetric-Clouds.md * Update Override-Volumetric-Clouds.md * Update Override-Volumetric-Clouds.md * updated phrasing consistency --- .../Override-Volumetric-Clouds.md | 62 +++++++++---------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md index 61dad1fc736..8e9c4be8998 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md @@ -2,11 +2,11 @@ The **Volumetric Clouds** [Volume component override](Volume-Components.md) controls settings relevant to rendering volumetric clouds in the High Definition Render Pipeline (HDRP). Volumetric clouds are intractable clouds that can render shadows, and receive fog and volumetric light. -To generate and render volumetric clouds, HDRP uses three things: a cloud lookup table, a cloud volume, and a cloud map: +To generate and render volumetric clouds, HDRP uses: -* The look up table defines properties such as the altitude, density, and lighting. -* The cloud volume describes the area in the Scene that HDRP generates the clouds in. -* The cloud map acts like a top down view of the scene. It defines which areas of the cloud volume have clouds and what kind of cloud they are. +* A cloud lookup table - defines properties such as the altitude, density, and lighting. +* A cloud volume - describes the area in the Scene that HDRP generates the clouds in. +* A cloud map - acts like a top down view of the scene. It defines which areas of the cloud volume have clouds and what kind of cloud they are. Using these three things, HDRP generates volumetric clouds in a two-step process: @@ -17,11 +17,9 @@ Using these three things, HDRP generates volumetric clouds in a two-step process [!include[](snippets/Volume-Override-Enable-Override.md)] -For this feature: +* In your HDRP Asset go to **Lighting > Volumetric Clouds > Volumetric Clouds**. -The property to enable in your HDRP Asset is: **Lighting > Volumetric Clouds > Volumetric Clouds**. - -The property to enable in your Frame Settings is: **Lighting > Volumetric Clouds**. +* In your Frame Settings go to **Lighting > Volumetric Clouds**. ## Using Volumetric Clouds @@ -36,26 +34,26 @@ The property to enable in your Frame Settings is: **Lighting > Volumetric Clouds ## Cloud map and cloud lookup table -The **Cloud Map** and **Clout LUT** textures define the shape and look of volumetric clouds. Both of these textures are [channel-packed](Glossary.md#channel-packing) where each channel contains a separate grayscale texture with a specific purpose. These two maps are not trivial to author, so it is best practice to only set **Cloud Control** to **Manual** if your project requires very specific clouds and you can use tool assistance to generate the maps. +The **Cloud Map** and **Clout LUT** Textures define the shape and look of volumetric clouds. Both of these Textures are [channel-packed](Glossary.md#channel-packing) where each channel contains a separate grayscale Texture with a specific purpose. These two maps are not trivial to author, so it is best to only set **Cloud Control** to **Manual** if your project requires very specific clouds and you can use tool assistance to generate the maps. For the **Cloud Map**, the color channels represent: -* **Red**: Coverage. Specifies the density of the clouds across the texture. +* **Red**: Coverage. Specifies the density of the clouds across the Texture. * Values closer to **0** represent an area of the clouds less affected by noise. * values closer to **1** represent an area of the clouds more affected by noise. * **Green**: Rain. Specifies the areas of the clouds that are lighter/darker. * Values closer to **0** represent an area of the clouds with less rain that are lighter in color. * Values closer to **1** represent an area of the clouds with more rain that are darker in color. -* **Blue**: Type. Maps along the cloud lookup table's horizontal axis to specify cloud properties at the world position the texel texture represents. +* **Blue**: Type. Maps along the cloud lookup table's horizontal axis to specify cloud properties at the world position the texel Texture represents. For the **Cloud LUT**, the color channels represent: * **Red**: Profile Coverage. Determines the density of the cloud based on its height within the cloud volume. -* **Green**: Erosion and shaping. Determines which areas of the cloud volume are more susceptible to erosion and shaping. Values closer to 1 means the cloud is more susceptible to erosion and shaping. +* **Green**: Erosion and shaping. Determines which areas of the cloud volume are more susceptible to erosion and shaping. Values closer to 1 mean the cloud is more susceptible to erosion and shaping. * **Blue**: Ambient Occlusion. A multiplier that HDRP applies to the ambient probe when it calculates lighting for the volumetric clouds. -When importing these two map textures, disable **sRGB**. For best results, do not use any compression. +When importing these two map Textures, disable **sRGB**. For best results, do not use any compression. **Note**: This cloud map is formatted differently to the cloud map that the [Cloud Layer](Override-Cloud-Layer.md) feature uses. @@ -65,30 +63,30 @@ When importing these two map textures, disable **sRGB**. For best results, do no | **Property** | **Description** | | ------------ | ----------------------------------------------------- | -| Enable | Indicates whether to render volumetric clouds or not. | -| Local Clouds | Indicates whether the clouds are part of the scene or rendered into the skybox. When enabled, clouds are part of the scene and you can interact with them. This means for example, you can move around the clouds, clouds can appear between the Camera and other GameObjects, and the Camera's clipping planes affects the clouds. When disabled, the clouds are part of the skybox. This mean the clouds and their shadows appear relative to the Camera and always appear behind geometry. | +| **Enable** | Indicates whether to render volumetric clouds or not. | +| **Local Clouds** | Indicates whether the clouds are part of the scene or rendered into the skybox. When enabled, clouds are part of the scene and you can interact with them. This means, you can move around the clouds, clouds can appear between the Camera and other GameObjects, and the Camera's clipping planes affects the clouds. When disabled, the clouds are part of the skybox. This means the clouds and their shadows appear relative to the Camera and always appear behind geometry. | ### Shape | **Property** | **Description** | | --------------------------------- | ------------------------------------------------------------ | -| **Cloud Control** | Specifies the mode to control volumetric cloud properties. The options are:
• **Simple**: Uses sliders and input fields to customize volumetric cloud shape properties. This mode generates a cloud map from the various properties and uses HDRP's internal cloud lookup table.
• **Advanced**: Uses separate textures to specify each cloud type and their coverage. This mode generates a cloud map from the various textures and uses HDRP's internal cloud lookup table.
• **Manual**: Uses the cloud map and lookup table you supply to render the clouds. For more information on the cloud map and cloud lookup table, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table). | +| **Cloud Control** | Specifies the mode to control volumetric cloud properties. The options are:
• **Simple**: Uses sliders and input fields to customize volumetric cloud shape properties. This mode generates a cloud map from the various properties and uses HDRP's internal cloud lookup table.
• **Advanced**: Uses separate Textures to specify each cloud type and their coverage. This mode generates a cloud map from the various Textures and uses HDRP's internal cloud lookup table.
• **Manual**: Uses the cloud map and lookup table you supply to render the clouds. For more information on the cloud map and cloud lookup table, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table). | | - **Cloud Preset** | Specifies the preset to apply to the **Simple** mode properties. The options are:
• **Sparse**: Smaller clouds that are spread apart.
• **Cloudy**: Medium-sized clouds that partially cover the sky.
• **Overcast**: A light layer of cloud that covers the entire sky. Some areas are less dense and let more light through, whereas other areas are more dense and appear darker.
• **Storm Clouds**: Large dark clouds that cover most of the sky.
• **Custom**: Exposes properties that control the shape of the clouds.

This property only appears if you set **Cloud Control** to **Simple**. | | - **Custom Density Curve** | Controls the density (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| | - **Custom Erosion Curve** | Controls the erosion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| | - **Custom Ambient Occlusion Curve** | Controls the ambient occlusion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| -| - **Cumulus Map** | Specifies a texture that defines the distribution of clouds in the lower layer.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cumulus Map** | Specifies a Texture that defines the distribution of clouds in the lower layer.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Cumulus Map Multiplier** | The multiplier for the clouds specified in the **Cumulus Map**. A value of **0** completely hides the cumulus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Alto Stratus Map** | Specifies a texture that defines the distribution of clouds in the higher layer.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Alto Stratus Map** | Specifies a Texture that defines the distribution of clouds in the higher layer.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Alto Stratus Map Multiplier** | The multiplier for the clouds specified in the **Alto Stratus Map**. A value of **0** completely hides the alto stratus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Cumulonimbus Map** | Specifies a texture that defines the distribution of anvil shaped cumulonimbus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cumulonimbus Map** | Specifies a Texture that defines the distribution of anvil shaped cumulonimbus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Cumulonimbus Map Multiplier** | The multiplier for the clouds specified in the **Cumulonimbus Map**. A value of **0** completely hides the cumulonimbus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Rain Map** | Specifies a texture that defines the distribution of rain in the clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Cloud Map Resolution** | Specifies the resolution for the internal texture HDRP uses for the cloud map. A lower resolution produces better performance, but less precise cloud type transitions.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Cloud Map** | Specifies the cloud map to use for the volumetric clouds. For information on the format of this texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | -| - **Cloud LUT** | Specifies the lookup table for the clouds. For information on the format of this texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | -| - **Cloud Map Tiling** | The **X** and **Y** UV tile rate for the cloud map texture/textures. HDRP uses the **X** and **Y** values to tile the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**. | -| - **Cloud Map Offset** | The **X** and **Y** UV offset for the cloud map texture/textures. HDRP uses the **X** and **Y** values to offset the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | +| - **Rain Map** | Specifies a Texture that defines the distribution of rain in the clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cloud Map Resolution** | Specifies the resolution for the internal Texture HDRP uses for the cloud map. A lower resolution produces better performance, but less precise cloud type transitions.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cloud Map** | Specifies the cloud map to use for the volumetric clouds. For information on the format of this Texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | +| - **Cloud LUT** | Specifies the lookup table for the clouds. For information on the format of this Texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | +| - **Cloud Map Tiling** | The **X** and **Y** UV tile rate for one or more cloud map Textures. HDRP uses the **X** and **Y** values to tile the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the Texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**. | +| - **Cloud Map Offset** | The **X** and **Y** UV offset for one or more cloud map Textures. HDRP uses the **X** and **Y** values to offset the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the Texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Density Multiplier** | The global density of the volumetric clouds.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Shape Factor** | Controls the amount of shaping to apply to the cloud volume. A higher value produces less cloud coverage and smaller clouds.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Shape Scale** | Controls the size of the noise HDRP uses in the shaping stage to generate the general cloud shapes.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | @@ -121,7 +119,7 @@ When importing these two map textures, disable **sRGB**. For best results, do no | **Property** | **Description** | | -------------------------------- | ------------------------------------------------------------ | | **Temporal Accumulation Factor** | The amount of temporal accumulation to apply to the clouds. Temporal accumulation increases the visual quality of clouds by decreasing the noise. A higher value produces better quality clouds, but can create [ghosting](Glossary.md#ghosting). | -| **Ghosting Reduction** | When you enable this property, HDRP removes the ghosting caused by temporal accumulation. This effect may cause a flickering effect when the **Temporal Accumulation Factor** value is low. | +| **Ghosting Reduction** | When you enable this property, HDRP removes the ghosting caused by temporal accumulation. This effect might cause a flickering effect when the **Temporal Accumulation Factor** value is low. | | **Num Primary Steps** | The number of steps to use to evaluate the clouds' transmittance. Higher values linearly increase the resource intensity of the effect. | | **Num Light Steps** | The number of steps to use to evaluate the clouds' lighting. Higher values exponent increase the resource intensity of the effect. | @@ -141,16 +139,14 @@ When importing these two map textures, disable **sRGB**. For best results, do no | -------------------------------- | ------------------------------------------------------------ | | **Shadows** | Indicates whether the volumetric clouds cast shadows. To render the shadows, this property overrides the cookie in the shadow casting directional [Light](Light-Component.md). If [Cloud Layer](Override-Cloud-Layer.md) is active and also is set to cast shadows, volumetric cloud shadows take precedent and override the Cloud Layer shadow cookie. | | - **Shadow Resolution** | Specifies the resolution of the volumetric clouds shadow map. | -| - **Shadow Plane Height Offset** | The vertical offset to apply to compute the volumetric clouds shadow. If the Scene geometry is not centered at **0** on the y-axis, set this offset equal to the y-axis center of your Scene geometry. | +| - **Shadow Plane Height Offset** | The vertical offset to apply to compute the volumetric clouds shadow. If the Scene geometry is not centered at **0** on the Y-axis, set this offset equal to the y-axis center of your Scene geometry. | | - **Shadow Distance** | The size of the area to render volumetric cloud shadows around the camera. | | - **Shadow Opacity** | The opacity of the volumetric cloud shadows. | | - **Shadow Opacity Fallback** | Controls the shadow opacity when outside the area covered by the volumetric clouds shadow. | ## Limitations -This section lists any limitations that HDRP's volumetric clouds have: - -- By default volumetric clouds are disabled on [Planar Reflection Probes](Planar-Reflection-Probe.md) and realtime [Reflection Probes](Reflection-Probe.md) because of the performance cost. -- When enabled for [Reflection Probes](Reflection-Probe.md), the volumetric clouds are rendered at low resolution, without any form of temporal accumulation for performance and stability reasons. -- By default volumetric clouds are enabled on the baked [Reflection Probes](Reflection-Probe.md) if the asset allows it. They are rendered at full resolution without any form of temporal accumulation. -- Volumetric clouds do not appear in ray-traced effects. +* By default, volumetric clouds are disabled on [Planar Reflection Probes](Planar-Reflection-Probe.md) and realtime [Reflection Probes](Reflection-Probe.md) because of the performance cost. +* When enabled for [Reflection Probes](Reflection-Probe.md), the volumetric clouds are rendered at low resolution, without any form of temporal accumulation for performance and stability reasons. +* By default volumetric clouds are enabled on the baked [Reflection Probes](Reflection-Probe.md) if the asset allows it. They are rendered at full resolution without any form of temporal accumulation. +* Volumetric clouds do not appear in ray-traced effects. From e1e4a2907c2a0bc6734a66ec2e74ba600948d25f Mon Sep 17 00:00:00 2001 From: Val Grimm <72067840+ValGrimm-U3D@users.noreply.github.com> Date: Wed, 1 Sep 2021 13:10:03 +0200 Subject: [PATCH 014/149] UNI-9114-HDRP-URP (#5374) * modify HDRP feature-comparison.md for Version 12 * modify URP lighting.md and universalrp-builtin-feature-comparison.md * modify HDRP Feature-Comparison.html --- .../Documentation~/Feature-Comparison.md | 4 ++-- .../Documentation~/lighting.md | 1 + .../universalrp-builtin-feature-comparison.md | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md b/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md index 57a078a6290..37f802adbce 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md @@ -86,8 +86,8 @@ The tables that follow provide an overview of the Features that the High Definit | **Feature** | **Built-in Render Pipeline** | **High Definition Render Pipeline (HDRP)** | | ------------------ | ------------------------ | ------------------------------- | -| **Enlighten** | Yes | Deprecated | -| **Enlighten Realtime** | Yes | Yes | +| **Enlighten Baked Global Illumination** | Yes | Deprecated

(Use the [CPU or GPU Progressive Lightmapper](https://docs.unity3d.com/Manual/progressive-lightmapper.html) instead) | +| **Enlighten Realtime Global Illumination** | Yes | Yes | | **Progressive CPU** | Yes | Yes | | **Progressive GPU** | Yes | Yes | diff --git a/com.unity.render-pipelines.universal/Documentation~/lighting.md b/com.unity.render-pipelines.universal/Documentation~/lighting.md index 315a510f86e..c3440c12fd8 100644 --- a/com.unity.render-pipelines.universal/Documentation~/lighting.md +++ b/com.unity.render-pipelines.universal/Documentation~/lighting.md @@ -8,6 +8,7 @@ Areas where the Universal Render Pipeline (URP) differs from Unity's common ligh * The [Light component inspector](light-component.md), which displays some URP-specific controls. * The [Universal Additional Light Data](universal-additional-light-data.md) component, which allows Unity to store Light-related data that is specific to URP. +* Enlighten Realtime Global Illumination is supported in URP from version 12. For more information, see the forum post [Update on Global Illumination 2021](https://forum.unity.com/threads/update-on-global-illumination-2021.1067015/). For a full comparison of lighting features between Unity's Built-in Render Pipeline and URP, and an up to date list of lighting features that are currently under research, see [this feature comparison chart](universalrp-builtin-feature-comparison.md). diff --git a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md index 83c4b0caf3d..d6d7dd0b65e 100644 --- a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md +++ b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md @@ -45,11 +45,11 @@ This table provides an overview of the current features supported in the Univers | *Shadow Resolve Type*
Lighting Pass
Screen Space Pass |
Yes
Yes |
Yes
No | | Shadow Bias | Constant clip space offset + normal bias | Offsets shadowmap texels in the light direction + normal bias| | ***Lightmapping*** | | | -| Enlighten | Yes | Yes | +| Enlighten Baked Global Illumination | Yes |Yes | | Progressive Lightmapper, CPU | Yes | Yes | | Progressive Lightmapper, GPU | Yes | Yes | -| ***Realtime Global Illumination*** | | | -| Enlighten | Yes | Not supported | +| ***Real-time Global Illumination*** | | | +| Enlighten Realtime Global Illumination | Yes | Yes | | ***Mixed Lighting Mode*** | | | | Subtractive | Yes | Yes | | Baked Indirect | Yes | Yes | From 4405ba311b9b0fe97a4a390c6f40fb24e0d70e59 Mon Sep 17 00:00:00 2001 From: Thomas Ingram Date: Wed, 1 Sep 2021 21:44:00 +1000 Subject: [PATCH 015/149] Removed self-references from VFXTransformBinder (#5347) https://forum.unity.com/threads/issue-vfxtransformbinder-redundantly-accesses-transform.1122433/ --- .../PropertyBinding/Implementation/VFXTransformBinder.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs b/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs index 8d8d133e20d..1dc5d91b9e4 100644 --- a/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs +++ b/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs @@ -40,9 +40,9 @@ public override bool IsValid(VisualEffect component) public override void UpdateBinding(VisualEffect component) { - component.SetVector3((int)Position, Target.transform.position); - component.SetVector3((int)Angles, Target.transform.eulerAngles); - component.SetVector3((int)Scale, Target.transform.localScale); + component.SetVector3((int)Position, Target.position); + component.SetVector3((int)Angles, Target.eulerAngles); + component.SetVector3((int)Scale, Target.localScale); } public override string ToString() From 1ee6467ff783f02f492a80b6bfeaeeb1c7fc433b Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Wed, 1 Sep 2021 18:46:21 +0300 Subject: [PATCH 016/149] Fix instability detection tagging (#5503) --- .yamato/script/log_scripts/log_parser.py | 52 +++++++++++-------- .yamato/script/log_scripts/utils/constants.py | 6 +++ .../script/log_scripts/utils/execution_log.py | 17 ++---- .yamato/script/log_scripts/utils/rules.py | 10 ---- .../script/log_scripts/utils/shared_utils.py | 27 ++++++++-- .yamato/script/log_scripts/utils/unity_log.py | 12 ++--- .yamato/script/log_scripts/utils/utr_log.py | 10 +--- 7 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.yamato/script/log_scripts/log_parser.py b/.yamato/script/log_scripts/log_parser.py index ed6adaf1f28..0cb9c7ccd43 100644 --- a/.yamato/script/log_scripts/log_parser.py +++ b/.yamato/script/log_scripts/log_parser.py @@ -4,7 +4,7 @@ import requests import sys import json -import glob +import traceback import re from utils.execution_log import Execution_log from utils.utr_log import UTR_log @@ -34,56 +34,61 @@ def parse_failures(execution_log, logs, local): '''Parses each command in the execution log (and possibly UTR logs), recognizes any known errors, and posts additional data to Yamato.''' - for cmd in logs.keys(): + for cmd_key in logs.keys(): + cmd = logs[cmd_key] # skip parsing successful commands which have not retried, or failed tests (these get automatically parsed in yamato results) # TODO: do we also want to add additional yamato results for these? - if ((logs[cmd]['status'] == 'Success' and not logs[cmd]['retry']) - or any("Reason(s): One or more tests have failed." in line for line in logs[cmd]['output'])): + if ((cmd['status'] == 'Success' and not cmd['retry']) + or any("Reason(s): One or more tests have failed." in line for line in cmd['output'])): continue - print('\nFound failed or retried command: ', cmd, '\n') + print('\nFound failed or retried command: ', cmd_key, '\n') # initialize command data - logs[cmd]['title'] = cmd - logs[cmd]['conclusion'] = [] - logs[cmd]['tags'] = [] - logs[cmd]['summary'] = [] + cmd['title'] = cmd_key + cmd['conclusion'] = [] + cmd['tags'] = [] + cmd['summary'] = [] # check if the error matches any known pattern marked in log_patterns.py, fill the command data for each match - cmd_output = '\n'.join(logs[cmd]['output']) - recursively_match_patterns(logs, cmd, execution_log.get_patterns(), cmd_output) + cmd_output = '\n'.join(cmd['output']) + recursively_match_patterns(cmd, execution_log.get_patterns(), cmd_output) # find all amtches + cmd['tags'] = format_tags(cmd['tags']) # flatten and remove duplicates + + # add unknown pattern if nothing else matched + add_unknown_pattern_if_appropriate(cmd) # post additional results to Yamato - post_additional_results(logs[cmd], local) + post_additional_results(cmd, local) return -def recursively_match_patterns(logs, cmd, patterns, failure_string): +def recursively_match_patterns(cmd, patterns, failure_string): '''Match the given string against any known patterns. If any of the patterns contains a 'redirect', parse also the directed log in a recursive fashion.''' matches = find_matching_patterns(patterns, failure_string) for pattern, match in matches: - logs[cmd]['conclusion'].append(pattern['conclusion']) - logs[cmd]['tags'].append(pattern['tags']) - logs[cmd]['summary'].append(match.group(0) if pattern['pattern'] != '.+' else 'Unknown failure: check logs for more details. ') + cmd['conclusion'].append(pattern['conclusion']) + cmd['tags'].append(pattern['tags']) + cmd['summary'].append(match.group(0)) if pattern.get('redirect'): - test_results_match = re.findall(r'(--artifacts_path=)(.+)(test-results)', cmd)[0] + test_results_match = re.findall(r'(--artifacts_path=)(.+)(test-results)', cmd['title'])[0] test_results_path = test_results_match[1] + test_results_match[2] for redirect in pattern['redirect']: if redirect == UTR_LOG: try: df = UTR_log(test_results_path) - recursively_match_patterns(logs, cmd, df.get_patterns(), df.read_log()) + recursively_match_patterns(cmd, df.get_patterns(), df.read_log()) except Exception as e: print(f'! Failed to parse UTR TestResults.json: ', str(e)) elif redirect == UNITY_LOG: try: df = Unity_log(test_results_path) - recursively_match_patterns(logs, cmd, df.get_patterns(), df.read_log()) + recursively_match_patterns(cmd, df.get_patterns(), df.read_log()) except Exception as e: print(f'! Failed to parse UnityLog.txt', str(e)) @@ -102,12 +107,12 @@ def post_additional_results(cmd, local): data = { 'title': cmd['title'], 'summary': ' | '.join(list(set([s[:500] for s in cmd['summary']]))), - 'conclusion': get_ruling_conclusion(cmd['conclusion']), - 'tags' : list(set(flatten_tags(cmd['tags']))) + 'conclusion': get_ruling_conclusion(cmd['conclusion'], cmd['tags']), + 'tags' : cmd['tags'] } if local: - print('\nPosting: ', json.dumps(data,indent=2), '\n') + print('\nPosting: ', json.dumps(data, indent=2), '\n') else: server_url = os.environ['YAMATO_REPORTING_SERVER'] + '/result' headers = {'Content-Type':'application/json'} @@ -137,7 +142,8 @@ def main(argv): parse_failures(execution_log, logs, args.local) except Exception as e: - print('Failed to parse logs: ', str(e)) + print('\nFailed to parse logs') + traceback.print_exc() if __name__ == '__main__': diff --git a/.yamato/script/log_scripts/utils/constants.py b/.yamato/script/log_scripts/utils/constants.py index 29d350efc30..a788f75bf95 100644 --- a/.yamato/script/log_scripts/utils/constants.py +++ b/.yamato/script/log_scripts/utils/constants.py @@ -2,3 +2,9 @@ UTR_LOG = 'utr_log' UNITY_LOG = 'unity_log' EXECUTION_LOG = 'execution_log' + + +# tags +TAG_SUCCESFUL_RETRY = 'successful-retry' +TAG_INSTABILITY = 'instability' +TAG_INFRASTRUCTURE = 'infrastructure' diff --git a/.yamato/script/log_scripts/utils/execution_log.py b/.yamato/script/log_scripts/utils/execution_log.py index 92e4d19fc64..94cb1d7f921 100644 --- a/.yamato/script/log_scripts/utils/execution_log.py +++ b/.yamato/script/log_scripts/utils/execution_log.py @@ -35,7 +35,7 @@ def get_patterns(self): # but no working regex for matching multiline against a negative lookahead was found yet. # Therefore, this pattern must come after failed retry pattern (python logic will handle recognizing this block as a successful retry) 'pattern': r'(Retrying)', - 'tags': ['successful-retry'], + 'tags': [TAG_SUCCESFUL_RETRY], 'conclusion': 'success', 'add_if': add_successful_retry_if }, @@ -43,7 +43,7 @@ def get_patterns(self): { # Or with newlines: r'(packet_write_poll: Connection to)((.|\n)+)(Operation not permitted)((.|\n)+)(lost connection)', 'pattern': r'(packet_write_poll: Connection to)(.+)(Operation not permitted)', - 'tags': ['packet_write_poll','instability', 'infrastructure'], + 'tags': ['packet_write_poll',TAG_INSTABILITY, TAG_INFRASTRUCTURE], 'conclusion': 'failure', }, { @@ -59,7 +59,7 @@ def get_patterns(self): }, { 'pattern': r'(LTO : error: L0492: LTOP internal error: bad allocation)', - 'tags': ['instability', 'bad-allocation', 'infrastructure'], + 'tags': [TAG_INSTABILITY, 'bad-allocation', TAG_INFRASTRUCTURE], 'conclusion': 'failure', }, { @@ -75,14 +75,6 @@ def get_patterns(self): UTR_LOG, UNITY_LOG ] - }, - # Order: this matches everything and must therefore be the last item in the list - # If any previous pattern has been matched, this one is skipped - { - 'pattern': r'.+', - 'tags': ['unknown'], - 'conclusion': 'failure', - 'add_if': add_unknown_pattern_if } ] @@ -96,7 +88,8 @@ def read_log(self): lines = [l.replace('\n','') for l in f.readlines() if l != '\n'] # remove empty lines and all newline indicators # after block index - after_idx = [i for i,line in enumerate(lines) if AFTER_BLOCK_START in line][0] + after_idxs = [i for i,line in enumerate(lines) if AFTER_BLOCK_START in line] + after_idx = after_idxs[0] if len(after_idxs) > 0 else len(lines) # all log line idx starting/ending a new command cmd_idxs = [i for i,line in enumerate(lines) if COMMAND_START in line] diff --git a/.yamato/script/log_scripts/utils/rules.py b/.yamato/script/log_scripts/utils/rules.py index 134bd3a2365..c246d63cbd0 100644 --- a/.yamato/script/log_scripts/utils/rules.py +++ b/.yamato/script/log_scripts/utils/rules.py @@ -1,13 +1,3 @@ -def add_unknown_pattern_if(matches): - '''Only add unknown pattern if no other pattern has been matched yet, - i.e. skip if no matches are found, or only matches indicate a retry.''' - if len(matches) == 0: - return True - elif len(matches) == 1: - if ('successful-retry' in matches[0][0]['tags'] or 'failed after' in matches[0][0]['pattern'].lower()): - return True - return False - def add_successful_retry_if(matches): '''Add only if failed retry has not matched''' diff --git a/.yamato/script/log_scripts/utils/shared_utils.py b/.yamato/script/log_scripts/utils/shared_utils.py index f447e3b9be9..4fe53888cef 100644 --- a/.yamato/script/log_scripts/utils/shared_utils.py +++ b/.yamato/script/log_scripts/utils/shared_utils.py @@ -1,5 +1,6 @@ import json import re +from .constants import * def load_json(file_path): with open(file_path) as f: @@ -26,13 +27,19 @@ def find_matching_patterns(patterns, failure_string): matches.append((pattern, match)) return matches -def flatten_tags(tags): - '''Tags param: 2d arr of tags gathered from patterns. Returns a 1d arr.''' - return [tag for tag_list in tags for tag in tag_list] +def format_tags(tags): + '''Flattens tags, removes duplicates, removes TAG_INSTABILITY if retry was successful + (latter is because we need to have either one or another, we cannot have both, so that we can distinguish them by tags)''' + tags = sorted(list(set([tag for tag_list in tags for tag in tag_list]))) # flatten and remove duplicates + if TAG_INSTABILITY in tags and TAG_SUCCESFUL_RETRY in tags: + tags.remove(TAG_INSTABILITY) + return tags -def get_ruling_conclusion(conclusions): +def get_ruling_conclusion(conclusions, tags): '''Pick a single conclusion out of several matches in the order of severity''' - if 'failure' in conclusions: + if TAG_SUCCESFUL_RETRY in tags: + return 'success' + elif 'failure' in conclusions: return 'failure' elif 'inconclusive' in conclusions: return 'inconclusive' @@ -42,3 +49,13 @@ def get_ruling_conclusion(conclusions): return 'success' else: return 'failure' + +def add_unknown_pattern_if_appropriate(cmd): + '''Adds an unknown failure pattern if no patterns were matched at all, or only successful retry was matched.''' + + if (len(cmd['tags']) == 0 # no pattern matched at all + or (len(cmd['tags']) == 1 and TAG_SUCCESFUL_RETRY in cmd['tags'])): # only successful retry pattern matched + + cmd['conclusion'].append('failure') + cmd['tags'].append('unknown') + cmd['summary'].append( 'Unknown failure: check logs for more details. ') diff --git a/.yamato/script/log_scripts/utils/unity_log.py b/.yamato/script/log_scripts/utils/unity_log.py index b4dcb89adf1..b05976bd044 100644 --- a/.yamato/script/log_scripts/utils/unity_log.py +++ b/.yamato/script/log_scripts/utils/unity_log.py @@ -2,6 +2,7 @@ import glob from .shared_utils import load_json, find_matching_patterns from .rules import * +from .constants import * class Unity_log(): ''''Handles parsing Unity log (UnityLog.txt) against known error patterns''' @@ -19,21 +20,14 @@ def get_patterns(self): # { # # commented out as this should always come paired with cache instability below # 'pattern': r'TcpProtobufSession::SendMessageAsync', - # 'tags': ['TcpProtobufSession', 'instability', 'infrastructure'], + # 'tags': ['TcpProtobufSession', TAG_INSTABILITY, TAG_INFRASTRUCTURE], # 'conclusion': 'failure', # }, { 'pattern': r'AcceleratorClientConnectionCallback - disconnected - cacheserver-slo', - 'tags': ['cache', 'instability', 'infrastructure'], + 'tags': ['cache', TAG_INSTABILITY, TAG_INFRASTRUCTURE], 'conclusion': 'failure', }, - { - # this matches everything and must therefore be the last item in the list - 'pattern': r'.+', - 'tags': ['unknown'], - 'conclusion': 'failure', - 'add_if': add_unknown_pattern_if - } ] def read_log(self): diff --git a/.yamato/script/log_scripts/utils/utr_log.py b/.yamato/script/log_scripts/utils/utr_log.py index 4ccbb82dd21..2ad95f3ad82 100644 --- a/.yamato/script/log_scripts/utils/utr_log.py +++ b/.yamato/script/log_scripts/utils/utr_log.py @@ -2,6 +2,7 @@ from .shared_utils import load_json, find_matching_patterns from .shared_utils import * from .rules import * +from .constants import * class UTR_log(): ''''Handles parsing UTR logs (TestResults.json) against known error patterns''' @@ -24,15 +25,8 @@ def get_patterns(self): # }, { 'pattern': r'System.AggregateException: One or more errors occurred. \(Detected that ios-deploy is not running when attempting to establish player connection.\)', - 'tags': ['ios-deploy', 'infrastructure'], # instability? + 'tags': ['ios-deploy', TAG_INFRASTRUCTURE], # instability? 'conclusion': 'failure', - }, - { - # this matches everything and must therefore be the last item in the list - 'pattern': r'.+', - 'tags': ['unknown'], - 'conclusion': 'failure', - 'add_if': add_unknown_pattern_if } ] From 3ce943836a1b53d2652cbb9978714d8750744380 Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Wed, 1 Sep 2021 18:09:29 +0200 Subject: [PATCH 017/149] [HDRP] Fix changelog --- .../CHANGELOG.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 032873d1319..8111f5205bd 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -6,8 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [13.0.0] - 2021-09-01 -Version Updated -The version number for this package has increased due to a version update of a related graphics package. +### Fixed +- Fixed impossibility to release the cursor in the template. +- Fixed assert failure when enabling the probe volume system for the first time. +- Significantly improved performance of APV probe debug. +- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) + +### changed +- Visual Environment ambient mode is now Dynamic by default. ## [12.0.0] - 2021-01-11 @@ -383,10 +389,6 @@ The version number for this package has increased due to a version update of a r - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) - Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. -- Fixed impossibility to release the cursor in the template. -- Fixed assert failure when enabling the probe volume system for the first time. -- Significantly improved performance of APV probe debug. -- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard @@ -492,7 +494,6 @@ The version number for this package has increased due to a version update of a r - Make some volumetric clouds properties additional to reduce the number default parameters (case 1357926). - Renamed the Cloud Offset to Cloud Map Offset in the volumetric clouds volume component (case 1358528). - Made debug panel mip bias functions internal, not public. -- Visual Environment ambient mode is now Dynamic by default. ## [11.0.0] - 2020-10-21 From b30737d94b415acf4529984b3e7cf16aae6b7049 Mon Sep 17 00:00:00 2001 From: Antoine Lelievre Date: Wed, 1 Sep 2021 18:11:23 +0200 Subject: [PATCH 018/149] [HDRP] Light anchor fixes (#5238) * Light anchor fixes * Updated changelog * Cleanup * Remove require component Light on the light anchor * Update com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com> * Fix anchor direction algorithm to work with distance of 0 and add anchor position override field * Fix anchor position when target is null * Check light anchor position override when assigned * Fix light anchor transform override when assigned + refresh when camera moves * "Fix" the rotation of the light with the camera + duplicate object fix * Fix formating Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com> Co-authored-by: skhiat <55133890+skhiat@users.noreply.github.com> Co-authored-by: SoufianeKHIAT Co-authored-by: sebastienlagarde --- .../Editor/Lighting/LightAnchorEditor.cs | 50 +++++++++++-- .../Editor/Lighting/LightAnchorEditorTool.cs | 9 ++- .../Editor/Lighting/LightAnchorHandles.cs | 13 +++- .../Runtime/Lights/LightAnchor.cs | 70 +++++++++++++++++-- .../CHANGELOG.md | 1 + 5 files changed, 125 insertions(+), 18 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs index 8c40551adc9..9e6660fbde7 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs @@ -30,6 +30,10 @@ public class LightAnchorEditor : Editor VisualElement m_GameViewRootElement; VisualElement m_ClickCatcher; + SerializedProperty m_DistanceProperty; + SerializedProperty m_FrameSpaceProperty; + SerializedProperty m_AnchorPositionOverrideProperty; + LightAnchor manipulator { get { return target as LightAnchor; } @@ -62,6 +66,7 @@ public override void OnInspectorGUI() bool pitchChanged = false; bool rollChanged = false; bool distanceChanged = false; + bool positionOverrideChanged = false; bool upChanged = false; using (var change = new EditorGUI.ChangeCheckScope()) @@ -126,14 +131,17 @@ public override void OnInspectorGUI() EditorGUILayout.Space(); EditorGUI.BeginChangeCheck(); - m_Distance = EditorGUILayout.FloatField(LightAnchorStyles.distanceProperty, manipulator.distance); + EditorGUILayout.PropertyField(m_DistanceProperty, LightAnchorStyles.distanceProperty); distanceChanged = EditorGUI.EndChangeCheck(); EditorGUI.BeginChangeCheck(); - var dropRect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight); - m_FrameSpace = (LightAnchor.UpDirection)EditorGUI.EnumPopup(dropRect, LightAnchorStyles.upDirectionProperty, manipulator.frameSpace); + EditorGUILayout.PropertyField(m_FrameSpaceProperty, LightAnchorStyles.upDirectionProperty); upChanged = EditorGUI.EndChangeCheck(); + EditorGUI.BeginChangeCheck(); + EditorGUILayout.PropertyField(m_AnchorPositionOverrideProperty, LightAnchorStyles.anchorPositionOverrideProperty); + positionOverrideChanged = EditorGUI.EndChangeCheck(); + if (m_FoldoutPreset = EditorGUILayout.Foldout(m_FoldoutPreset, "Common")) { Color cachedColor = GUI.backgroundColor; @@ -266,11 +274,11 @@ public override void OnInspectorGUI() { Undo.RecordObjects(new UnityEngine.Object[] { target, manipulator.transform }, "Light Anchor Change"); - manipulator.frameSpace = m_FrameSpace; + manipulator.frameSpace = (LightAnchor.UpDirection)m_FrameSpaceProperty.intValue; manipulator.SynchronizeOnTransform(camera); UpdateCache(); } - if (yawChanged || pitchChanged || rollChanged || distanceChanged) + if (yawChanged || pitchChanged || rollChanged || distanceChanged || positionOverrideChanged) { Undo.RecordObjects(new UnityEngine.Object[] { target, manipulator.transform }, "Light Anchor Change"); @@ -281,7 +289,32 @@ public override void OnInspectorGUI() if (rollChanged) manipulator.roll = m_Roll; if (distanceChanged) - manipulator.distance = m_Distance; + manipulator.distance = m_DistanceProperty.floatValue; + if (positionOverrideChanged) + { + var newTransform = m_AnchorPositionOverrideProperty.objectReferenceValue as Transform; + + if (newTransform != null) + { + // Check that the assigned transform is not child of the light anchor, otherwise it would cause problems when moving the light position + if (newTransform.IsChildOf(manipulator.transform)) + Debug.LogError($"Can't assign '{newTransform.name}' because it's a child of the Light Anchor component"); + else + { + float newDistance = Vector3.Distance(manipulator.transform.position, newTransform.position); + manipulator.anchorPositionOverride = newTransform; + // Orient the object to face the new override position + manipulator.SynchronizeOnTransform(camera); + // And adjust it's distance to avoid modifying it's position. + manipulator.distance = newDistance; + } + } + else + manipulator.anchorPositionOverride = newTransform; + } + + if (manipulator.anchorPositionOverride != null) + anchor = manipulator.anchorPosition; manipulator.UpdateTransform(camera, anchor); IsCacheInvalid(manipulator); @@ -321,6 +354,10 @@ void OnEnable() EnableClickCatcher(m_EnableClickCatcher); } } + + m_DistanceProperty = serializedObject.FindProperty("m_Distance"); + m_FrameSpaceProperty = serializedObject.FindProperty("m_FrameSpace"); + m_AnchorPositionOverrideProperty = serializedObject.FindProperty("m_AnchorPositionOverride"); } void EditorToolsOnactiveToolChanged() @@ -561,6 +598,7 @@ static class LightAnchorStyles static public GUIContent presetTextureRimRight = EditorGUIUtility.TrTextContent("", "Rim Right", UnityEditor.Rendering.CoreEditorUtils.LoadIcon(LightAnchorStyles.k_IconFolder, "PresetRim_Right", ".png", false)); static public GUIContent distanceProperty = EditorGUIUtility.TrTextContent("Distance", "Controls how far 'back', the light is placed from its anchor"); static public GUIContent upDirectionProperty = EditorGUIUtility.TrTextContent("Up direction", "Specifies the space in which the up direction of the anchor is defined. Local is relative to the camera."); + static public GUIContent anchorPositionOverrideProperty = EditorGUIUtility.TrTextContent("Anchor Position Override", "Specifies the anchor position manually instead of relying on the angles, distance and transform position to compute the anchor position."); static public GUIContent[] angleSubContent = new[] { EditorGUIUtility.TrTextContent("Orbit"), diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs index 4fc2c47dc20..206956d9e3c 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs @@ -30,7 +30,10 @@ public override GUIContent toolbarIcon /// Always return true public override bool IsAvailable() { - return true; + var lightAnchor = target as LightAnchor; + + // Hide the transform if a position override object is assigned + return (lightAnchor?.anchorPositionOverride == null); } /// @@ -39,7 +42,7 @@ public override bool IsAvailable() /// The window that is displaying the custom editor tool. public override void OnToolGUI(EditorWindow window) { - if (target == null) + if (target is LightAnchor l && l?.anchorPositionOverride == null) return; DoTargetGUI(target); @@ -112,7 +115,7 @@ LightAnchorHandles GetHandles(UnityObject obj) LightAnchorHandles handles; if (!m_LightAnchorHandles.TryGetValue(obj, out handles)) { - handles = new LightAnchorHandles(); + handles = new LightAnchorHandles(obj as LightAnchor); m_LightAnchorHandles.Add(obj, handles); } diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs index 99bc7dd85e6..f01bc2d0394 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs @@ -16,11 +16,15 @@ public class LightAnchorHandles /// public Vector3 anchorPosition { get; set; } + LightAnchor target; + /// /// Initializes and returns an instance of LightAnchorHandles /// - public LightAnchorHandles() + /// Target object + public LightAnchorHandles(LightAnchor target) { + this.target = target; } /// @@ -31,7 +35,12 @@ public void OnGUI() Handles.color = Color.yellow; Handles.DrawDottedLine(lightPosition, anchorPosition, 2f); - anchorPosition = Handles.PositionHandle(anchorPosition, Quaternion.identity); + // Orient the handle rotation depending on the editor pivot rotation mode + var handleRotation = Quaternion.identity; + if (Tools.pivotRotation == PivotRotation.Local && target != null) + handleRotation = target.transform.rotation; + + anchorPosition = Handles.PositionHandle(anchorPosition, handleRotation); } } } diff --git a/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs b/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs index df00a3ab726..e8a88932005 100644 --- a/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs +++ b/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs @@ -10,7 +10,6 @@ namespace UnityEngine /// Represents camera-space light controls around a virtual pivot point. /// [AddComponentMenu("Rendering/Light Anchor")] - [RequireComponent(typeof(Light))] [ExecuteInEditMode] [DisallowMultipleComponent] [CoreRPHelpURLAttribute("View-Lighting-Tool")] @@ -19,13 +18,18 @@ public class LightAnchor : MonoBehaviour const float k_ArcRadius = 5; const float k_AxisLength = 10; - [SerializeField] + [SerializeField, Min(0)] float m_Distance = 0f; [SerializeField] UpDirection m_FrameSpace = UpDirection.World; + [SerializeField] + Transform m_AnchorPositionOverride; + [SerializeField] float m_Yaw; + [SerializeField] float m_Pitch; + [SerializeField] float m_Roll; /// @@ -69,8 +73,8 @@ public float roll /// public float distance { - get { return m_Distance; } - set { m_Distance = Mathf.Max(value, .01f); } + get => m_Distance; + set => m_Distance = Mathf.Max(0, value); } /// @@ -102,7 +106,13 @@ public UpDirection frameSpace /// public Vector3 anchorPosition { - get { return transform.position + transform.forward * m_Distance; } + get + { + if (anchorPositionOverride != null) + return anchorPositionOverride.position; + else + return transform.position + transform.forward * distance; + } } struct Axes @@ -112,6 +122,16 @@ struct Axes public Vector3 forward; } + /// + /// Overrides the pivot of used to compute the light position. This is useful to track an existing object in the scene. + /// The transform of the light will be automatically updated by the Update() method of the LightAnchor. + /// + public Transform anchorPositionOverride + { + get => m_AnchorPositionOverride; + set => m_AnchorPositionOverride = value; + } + /// /// Normalizes the input angle to be in the range of -180 and 180. /// @@ -136,6 +156,10 @@ public void SynchronizeOnTransform(Camera camera) Vector3 worldAnchorToLight = transform.position - anchorPosition; + // In case the distance is 0 or the anchor override is at the same position than the light anchor + if (worldAnchorToLight.magnitude == 0) + worldAnchorToLight = -transform.forward; + Vector3 projectOnGround = Vector3.ProjectOnPlane(worldAnchorToLight, axes.up); projectOnGround.Normalize(); @@ -162,7 +186,28 @@ public void UpdateTransform(Camera camera, Vector3 anchor) Axes GetWorldSpaceAxes(Camera camera) { + // Fallback when the light anchor object is child of the camera (bad setup) + if (transform.IsChildOf(camera.transform)) + { + return new Axes + { + up = Vector3.up, + right = Vector3.right, + forward = Vector3.forward, + }; + } + Matrix4x4 viewToWorld = camera.cameraToWorldMatrix; + + // Correct view to world for perspective + if (!camera.orthographic && camera.transform.position != anchorPosition) + { + var d = (anchorPosition - camera.transform.position).normalized; + var f = Quaternion.LookRotation(d); + viewToWorld = Matrix4x4.Scale(new Vector3(1, 1, -1)) * Matrix4x4.TRS(camera.transform.position, f, Vector3.one).inverse; + viewToWorld = viewToWorld.inverse; + } + if (m_FrameSpace == UpDirection.World) { Vector3 viewUp = (Vector3)(Camera.main.worldToCameraMatrix * Vector3.up); @@ -182,6 +227,15 @@ Axes GetWorldSpaceAxes(Camera camera) }; } + void Update() + { + if (anchorPositionOverride == null || Camera.main == null) + return; + + if (anchorPositionOverride.hasChanged || Camera.main.transform.hasChanged) + UpdateTransform(Camera.main, anchorPosition); + } + void OnDrawGizmosSelected() { var camera = Camera.main; @@ -191,6 +245,8 @@ void OnDrawGizmosSelected() return; } + // TODO: fix light rotated when camera rotates + Axes axes = GetWorldSpaceAxes(camera); Vector3 anchor = anchorPosition; Vector3 d = transform.position - anchor; @@ -229,10 +285,10 @@ void UpdateTransform(Vector3 up, Vector3 right, Vector3 forward, Vector3 anchor) { Quaternion worldYawRot = Quaternion.AngleAxis(m_Yaw, up); Quaternion worldPitchRot = Quaternion.AngleAxis(m_Pitch, right); - Vector3 worldPosition = anchor + (worldYawRot * worldPitchRot) * forward * m_Distance; + Vector3 worldPosition = anchor + (worldYawRot * worldPitchRot) * forward * distance; transform.position = worldPosition; - Vector3 lookAt = (anchor - worldPosition).normalized; + Vector3 lookAt = -((worldYawRot * worldPitchRot) * forward).normalized; Vector3 angles = Quaternion.LookRotation(lookAt, up).eulerAngles; angles.z = m_Roll; transform.eulerAngles = angles; diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 8111f5205bd..bf646ec3074 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed assert failure when enabling the probe volume system for the first time. - Significantly improved performance of APV probe debug. - Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) +- Fixed light anchor min distance value + properties not working with prefabs (case 1345509). ### changed - Visual Environment ambient mode is now Dynamic by default. From a243b459d0fc0c038b245169f047c58e5fb3e1e5 Mon Sep 17 00:00:00 2001 From: Erik Hakala <59870743+eh-unity@users.noreply.github.com> Date: Wed, 1 Sep 2021 19:22:53 +0300 Subject: [PATCH 019/149] Write alpha channel to RT for Unlit particle shader too. (#5368) --- .../Shaders/Particles/ParticlesUnlit.shader | 1 - 1 file changed, 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader index e5b7c015765..c43b3e776bd 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader @@ -70,7 +70,6 @@ Shader "Universal Render Pipeline/Particles/Unlit" Blend[_SrcBlend][_DstBlend] ZWrite[_ZWrite] Cull[_Cull] - ColorMask RGB HLSLPROGRAM #pragma target 2.0 From 998d48c992abdafd1abe5439a04717faedef7cc6 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Wed, 1 Sep 2021 18:59:16 +0200 Subject: [PATCH 020/149] Fix warning in TAA (#5506) --- .../Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b2f212ce8e8..853e5843132 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 @@ -129,7 +129,7 @@ Shader "Hidden/HDRP/TemporalAA" #define _BaseBlendFactor _TaaPostParameters1.x #define _CentralWeight _TaaPostParameters1.y - #define _ExcludeTAABit _TaaPostParameters1.z + #define _ExcludeTAABit (uint)_TaaPostParameters1.z // TAAU specific float4 _TaauParameters; From ca77aca7eabc43c862eba78a67d37ce5a2349f9b Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Thu, 2 Sep 2021 12:41:58 +0300 Subject: [PATCH 021/149] [GitHub Actions] Update pr-commenter to reference trunk (#5510) --- .github/pr-commenter.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/pr-commenter.yml b/.github/pr-commenter.yml index eb58856910c..8e46bda3a21 100644 --- a/.github/pr-commenter.yml +++ b/.github/pr-commenter.yml @@ -16,7 +16,7 @@ comment: - TestProjects/HDRP*/**/* body: | **HDRP** - `/.yamato%252Fall-hdrp.yml%2523PR_HDRP_2021.2` + `/.yamato%252Fall-hdrp.yml%2523PR_HDRP_trunk` - id: URP files: - com.unity.render-pipelines.universal/**/* @@ -24,7 +24,7 @@ comment: - TestProjects/Universal*/**/* body: | **URP** - `/.yamato%252Fall-urp.yml%2523PR_URP_2021.2` + `/.yamato%252Fall-urp.yml%2523PR_URP_trunk` - id: ShaderGraph files: - com.unity.shadergraph/**/* @@ -32,10 +32,10 @@ comment: - com.unity.render-pipelines.universal/Editor/ShaderGraph/* body: | **Shader Graph** - `/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.2` + `/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk` Depending on your PR, you may also want - `/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.2` - `/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_2021.2` + `/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk` + `/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_trunk` - id: VFX files: - com.unity.visualeffectgraph/**/* @@ -43,12 +43,12 @@ comment: - TestProjects/VisualEffectGraph*/**/* body: | **VFX** - `/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2` + `/.yamato%252Fall-vfx.yml%2523PR_VFX_trunk` - id: Core files: - com.unity.render-pipelines.core/**/* body: | **SRP Core** You could run ABV on your branch before merging your PR, but it will start A LOT of jobs. Please be responsible about it and run it only when you feel the PR is ready: - `/.yamato%252F_abv.yml%2523all_project_ci_2021.2` + `/.yamato%252F_abv.yml%2523all_project_ci_trunk` Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead. From 492837420ad616ed40f874048730038acef4849e Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Thu, 2 Sep 2021 17:11:22 +0200 Subject: [PATCH 022/149] Revert "Changed Ambient Mode to Dynamic by default (#5465)" This reverts commit ab066314a5b16898c2c3122ced03584ae52a19a1. --- .../Scene Settings Profile.asset | 95 +- .../1214_Lit_LowResTransparent.unity | 22 +- .../1x_Materials/1225_Lit_SpeedTree8SG.unity | 20 +- .../Scene Settings Profile.asset | 168 +- .../Scenes/1x_Materials/1301_StackLitSG.unity | 16 +- .../Scene Settings Profile.asset | 131 +- .../1x_Materials/1602_TerrainLit_Normal.unity | 18 +- .../1x_Materials/1801_MaterialQuality.unity | 779 ++-- .../Global Volume Profile.asset | 47 - .../Global Volume Profile.asset.meta | 8 - .../1900_AlphaTest_SG/HDRP_Volume.asset | 68 +- .../1x_Materials/1900_AlphaTest_SG_a.unity | 470 ++- .../HDRP_Default_Sky 1.asset | 134 +- .../2009_MultipleSkies/Sky_Static.asset | 94 +- .../Sky and Fog Settings Profile 1.asset | 2 +- .../2204_ReflectionProbes_Lights.unity | 3700 +++++++---------- .../Scene Settings Profile.asset | 47 - .../Scene Settings Profile.asset.meta | 8 - .../2206_PlanarReflectionVFace.meta | 8 - .../2206_PlanarReflectionVFace.unity | 571 +-- .../Global Volume Profile.asset | 47 - .../Global Volume Profile.asset.meta | 8 - .../Scene Settings Profile.asset | 65 +- .../2207_ReflectionProbeVFace.meta | 8 - .../2207_ReflectionProbeVFace.unity | 575 +-- .../Global Volume Profile.asset | 47 - .../Global Volume Profile.asset.meta | 8 - .../Scene Settings Profile.asset | 38 +- .../Global Volume Profile.asset | 67 +- .../Global Volume Profile.asset | 61 +- .../Global Volume Profile.asset | 97 +- .../Scene Settings Profile.asset | 267 +- .../MotionBlurProfile.asset | 91 +- .../GlobalVolume Profile.asset | 18 - .../5001_Fog_FogFallback/Volume_Base.asset | 48 +- .../Scene Settings Profile.asset | 125 +- .../5011_VolumetricClouds/GlobalVolume.asset | 90 +- .../Global Volume Profile.asset | 124 +- .../Scene Settings Profile.asset | 34 +- .../Scene Settings Profile.asset | 34 +- .../Scene Settings Profile.asset | 117 +- .../VFXTests/GraphicsTests/HDRP.prefab | 36 +- .../VFXTests/GraphicsTests/HDRP.unity | 5 - .../HDRPFogVolumetric Settings Profile.asset | 90 +- .../GraphicsTests/HDRPFogVolumetric.unity | 220 +- .../GraphicsTests/HDRP_SceneSetting.asset | 35 +- .../GraphicsTests/ParticleRibbonLit.unity | 232 +- .../ParticleRibbonLitVolumeProfile.asset | 94 +- .../Runtime/Sky/VisualEnvironment.cs | 2 +- 49 files changed, 3351 insertions(+), 5738 deletions(-) delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset delete mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset index 9b4a1746c0c..1cd72badfb8 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset @@ -31,18 +31,6 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -62,6 +50,8 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -71,12 +61,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 2.2355762 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -86,84 +75,10 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 9c13f7d97fda704439868458dc2385ed, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity index 0daf509640b..2dc6343507f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity @@ -153,7 +153,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.02, y: -0.94, z: -0.01785475} m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 3 @@ -313,7 +312,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -588,7 +587,6 @@ Transform: m_LocalRotation: {x: 0.12893414, y: -0, z: -0, w: 0.99165314} m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 150555374} - {fileID: 1560707990} @@ -624,7 +622,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.05, y: 1.76, z: -0.02} m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 2 @@ -824,7 +821,6 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -840,6 +836,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -923,7 +920,6 @@ Transform: m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1020,7 +1016,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: -3.2892313, z: -0.3983413} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1117,7 +1112,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: -3.2892313, z: -0.3983413} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1214,7 +1208,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: 1.6230732, z: -1.7315147} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1248,7 +1241,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.02, y: -3.01, z: -0.02} m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 4 @@ -1427,7 +1419,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: -0.7896553, z: -1.0767106} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -1524,7 +1515,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: -0.7896553, z: -1.0767106} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1558,7 +1548,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.68, y: 2.941782, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 1 @@ -1737,7 +1726,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: 1.6230732, z: -1.7315147} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1771,7 +1759,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.818, y: 2.941782, z: 0} m_LocalScale: {x: 3, y: 3, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 0 @@ -1884,7 +1871,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.23, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1517719156} - {fileID: 1270125020} @@ -1987,7 +1973,6 @@ Transform: m_LocalRotation: {x: -0.73307997, y: -0, z: -0, w: 0.6801425} m_LocalPosition: {x: -12.526949, y: -0.15709, z: 4.54} m_LocalScale: {x: 2.1692, y: 1, z: 2.3152} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -2037,7 +2022,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -2052,7 +2037,6 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity index 23a0110f8b9..09d39e319bc 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity @@ -336,7 +336,6 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.69, y: 0.5, z: -1.441} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -367,7 +366,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 0.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1127870805} m_Father: {fileID: 1935598840} @@ -472,7 +470,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 5, y: 5, z: 5} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -509,7 +506,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 1.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1636819555} m_Father: {fileID: 1935598840} @@ -541,7 +537,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 0.95154047, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 421122601} m_Father: {fileID: 1025210030} @@ -825,7 +820,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.9515405, y: -3.2690406, z: -4.989624} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1189675139} - {fileID: 1841570170} @@ -955,7 +949,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 2.9515405, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1369615379} m_Father: {fileID: 1025210030} @@ -987,7 +980,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: -0.7708664, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1880594515} m_Father: {fileID: 1935598840} @@ -1038,7 +1030,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -1053,7 +1045,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1096,7 +1087,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: -0.04845953, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 426221817} m_Father: {fileID: 1025210030} @@ -1143,7 +1133,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1220,7 +1209,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -1529,7 +1518,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 1.9515405, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1398137499} m_Father: {fileID: 1025210030} @@ -1666,7 +1654,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.2291336, y: 0.93398416, z: -0.60040474} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2110808628} - {fileID: 568011718} @@ -1765,7 +1752,6 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0.395, y: 4.331, z: -3.78} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -2104,7 +2090,6 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.694, y: 0.5, z: 0.55} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -2135,7 +2120,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 2.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1683058730} m_Father: {fileID: 1935598840} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset index 6de27ca1bce..b509429d276 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset @@ -4,8 +4,7 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -21,8 +20,7 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -33,117 +31,30 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 + min: 0 + max: 360 exposure: m_OverrideState: 0 m_Value: 0 multiplier: m_OverrideState: 0 m_Value: 1 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 + min: 0 updateMode: m_OverrideState: 0 m_Value: 0 updatePeriod: m_OverrideState: 0 m_Value: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 + min: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 --- !u!114 &114392438171864176 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -154,39 +65,48 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - directionalTransmissionMultiplier: - m_OverrideState: 0 - m_Value: 1 + min: 0 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 + min: 0 + max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 + min: 0 + max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 + min: 0 + max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 + min: 0 --- !u!114 &114499654985824276 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -197,48 +117,49 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 + min: 0 + max: 360 exposure: m_OverrideState: 1 m_Value: 0 multiplier: m_OverrideState: 1 m_Value: 1 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 + min: 0 updateMode: m_OverrideState: 1 m_Value: 0 updatePeriod: m_OverrideState: 1 m_Value: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 + min: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 + min: 0 + max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -246,8 +167,7 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -258,18 +178,6 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity index da6377ef28e..a47da77d5f7 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity @@ -301,7 +301,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -416,7 +415,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.9515405, y: -3.2690406, z: -4.989624} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2108988498} - {fileID: 1703845552} @@ -725,7 +723,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -740,7 +738,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -806,11 +803,6 @@ PrefabInstance: propertyPath: field of view value: 45 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 8 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1703845551 @@ -987,7 +979,6 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0.395, y: 4.331, z: -3.78} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1087,7 +1078,6 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -1103,6 +1093,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -1227,7 +1218,6 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1243,6 +1233,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -1326,7 +1317,6 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset index f939eda6ecf..f5735f97a8a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset @@ -33,33 +33,43 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - directionalTransmissionMultiplier: - m_OverrideState: 0 - m_Value: 1 + min: 0 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 + min: 0 + max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 + min: 0 + max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 + min: 0 + max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 + min: 0 --- !u!114 &114374333047554170 MonoBehaviour: m_ObjectHideFlags: 0 @@ -76,6 +86,8 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -85,12 +97,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -100,24 +111,37 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 + min: 0 + max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -137,6 +161,8 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -146,12 +172,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.0145614 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -161,87 +186,13 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 --- !u!114 &114883432347898006 MonoBehaviour: m_ObjectHideFlags: 0 @@ -258,18 +209,6 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity index ac4ed96683a..e9e52f241ba 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.047137707, g: 0.06653553, b: 0.105606586, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -238,7 +238,6 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -254,6 +253,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -337,7 +337,6 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 8.476068, y: -5.7846136, z: 9.519677} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -415,7 +414,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -465,7 +463,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -480,7 +478,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -513,7 +510,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.9, y: 0, z: 14.26} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1526466806} m_RootOrder: 0 @@ -642,11 +638,6 @@ PrefabInstance: propertyPath: field of view value: 40 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: m_Version - value: 8 - objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: clearColorMode @@ -757,7 +748,6 @@ Transform: m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: -10, y: 0, z: 10} m_LocalScale: {x: 2, y: 1, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -788,7 +778,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 598431484} - {fileID: 1869420999} @@ -823,7 +812,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -1.87, y: 0, z: 14.26} m_LocalScale: {x: 1, y: 1.0000005, z: 1.0000005} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1526466806} m_RootOrder: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity index c395c6ddbef..f0345dd7dc8 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity @@ -24,7 +24,7 @@ RenderSettings: m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 + m_AmbientMode: 4 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -153,72 +151,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 513 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 - m_Version: 8 + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -265,6 +198,51 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 513 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 --- !u!20 &42229485 Camera: m_ObjectHideFlags: 0 @@ -318,7 +296,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -9.561, y: 3.34, z: 1.38} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1177063882} m_Father: {fileID: 0} @@ -367,12 +344,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -416,7 +391,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.699999, y: 3.27, z: 9.58} m_LocalScale: {x: 1.6464, y: 1.6464, z: 1.6464} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -428,6 +402,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1502620697} m_Modifications: + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 1 + objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -438,31 +417,6 @@ PrefabInstance: Reflection on low' objectReference: {fileID: 0} - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 0.01953125 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -478,11 +432,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.99 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -498,6 +447,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -513,6 +472,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01953125 + objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -537,10 +511,6 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 104.8 @@ -553,10 +523,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -10 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -569,6 +535,14 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -594,7 +568,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -603,30 +577,30 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: xrLayout - value: 0 + propertyPath: ImageComparisonSettings.TargetWidth + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 512 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: waitFrames value: 1 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrLayout + value: 0 + objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipelineAsset value: objectReference: {fileID: 11400000, guid: a1e896277e7aec54dab400844753769a, type: 2} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 512 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &345783686 stripped @@ -635,55 +609,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 345783685} m_PrefabAsset: {fileID: 0} ---- !u!1 &788298197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 788298199} - - component: {fileID: 788298198} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &788298198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 788298197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: e933dcbd683c300418703544e87bd63e, type: 2} ---- !u!4 &788298199 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 788298197} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -133.65039, y: -9.035299, z: 33.127846} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1177063881 PrefabInstance: m_ObjectHideFlags: 0 @@ -691,37 +616,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 42229486} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_Text - value: 'Camera with default Quality (high) - - Reflection on low' - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_CharacterSize value: 1 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} - propertyPath: m_LocalScale.z - value: 0.01953125 + propertyPath: m_Text + value: 'Camera with default Quality (high) + + Reflection on low' objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} @@ -738,11 +643,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.99 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -758,6 +658,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -773,6 +683,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01953125 + objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -816,72 +741,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 257 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 1 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 - materialQuality: 2 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 4 - defaultFrameSettings: 0 - m_Version: 8 + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -928,6 +788,51 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 257 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 1 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + materialQuality: 2 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 4 + defaultFrameSettings: 0 --- !u!20 &1502620696 Camera: m_ObjectHideFlags: 0 @@ -981,7 +886,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -9.561, y: 3.34, z: 1.38} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 292073641} m_Father: {fileID: 0} @@ -1019,6 +923,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1035,17 +1034,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 19.89, y: 0.01, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1058,24 +1046,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 19.89, y: 0.01, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: -0.70710677, y: 0, z: 0, w: 0.70710677} - resolutionScalable: - m_Override: 512 - m_UseOverride: 1 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 1 renderingPathCustomFrameSettings: @@ -1088,10 +1082,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 1 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1109,8 +1099,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1187,8 +1177,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1232,9 +1220,6 @@ MonoBehaviour: e32: 0 e33: 0 m_CapturePosition: {x: 0, y: 0, z: 0} - m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} - m_FieldOfView: 0 - m_Aspect: 0 m_CustomRenderData: m_WorldToCameraRHS: e00: 0 @@ -1271,139 +1256,13 @@ MonoBehaviour: e32: 0 e33: 0 m_CapturePosition: {x: 0, y: 0, z: 0} - m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} - m_FieldOfView: 0 - m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} - m_PlanarProbeVersion: 7 + m_EditorOnlyData: 0 + m_PlanarProbeVersion: 6 m_ObsoleteCaptureNearPlane: 0.3 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} --- !u!23 &1553371902 MeshRenderer: m_ObjectHideFlags: 0 @@ -1415,12 +1274,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1456,7 +1313,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1478,7 +1335,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.7, y: 1.55, z: 9.27} m_LocalScale: {x: 1.9826, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1514,7 +1370,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_StaticLightingCloudsUniqueID: 0 + m_SkySettings: {fileID: 0} + m_SkySettingsFromProfile: {fileID: 0} --- !u!4 &1608707855 Transform: m_ObjectHideFlags: 1 @@ -1525,7 +1382,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1560,16 +1416,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 1 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1577,25 +1439,16 @@ MonoBehaviour: 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_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 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 @@ -1603,9 +1456,6 @@ 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 @@ -1636,14 +1486,6 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 - m_BarnDoorAngle: 90 - m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1659,17 +1501,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 9 --- !u!108 &1766079452 Light: m_ObjectHideFlags: 0 @@ -1729,7 +1561,6 @@ 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 &1766079453 @@ -1742,7 +1573,6 @@ Transform: m_LocalRotation: {x: 0.16987649, y: -0.029034924, z: -0.25718543, w: 0.95087045} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1776,7 +1606,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2.3899999} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 345783686} m_RootOrder: 0 @@ -1791,7 +1620,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1806,12 +1635,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 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/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset deleted file mode 100644 index 47071e5eb8c..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -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: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Global Volume Profile - m_EditorClassIdentifier: - components: - - {fileID: 996082102067431880} ---- !u!114 &996082102067431880 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta deleted file mode 100644 index 284763b28f4..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e933dcbd683c300418703544e87bd63e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset index d334e59a614..b25adcbecfb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset @@ -29,15 +29,21 @@ MonoBehaviour: m_Name: HDShadowSettings m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 20 + min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 cascadeShadowSplitCount: m_OverrideState: 0 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 0 m_Value: 0.05 @@ -72,9 +78,12 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 200 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -84,9 +93,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.4660715 + min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} @@ -99,35 +110,13 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 1 - m_Value: - mode: 0 - customValue: 200 - additiveValue: 0 - multiplyValue: 0 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -143,21 +132,31 @@ MonoBehaviour: 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 @@ -167,19 +166,6 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 --- !u!114 &114827887035766406 MonoBehaviour: m_ObjectHideFlags: 3 @@ -193,21 +179,13 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity index 86d143105d1..eaf457a709f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.31014416, g: 0.3259645, b: 0.36057484, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -152,7 +152,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -10.475559, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 1 @@ -190,7 +189,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -247,7 +245,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 113455552} - {fileID: 1780913221} @@ -282,7 +279,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94484690} m_RootOrder: 0 @@ -298,7 +294,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -365,7 +360,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 6, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 1 @@ -381,7 +375,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -446,7 +439,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1319188787} - {fileID: 115245477} @@ -496,7 +488,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 0 @@ -512,7 +503,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -579,7 +569,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3, y: 0.29, z: 3.1899986} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 1 @@ -617,7 +606,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -691,7 +679,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -724,7 +711,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -4.475559, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 2 @@ -762,7 +748,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -821,7 +806,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1823638298} m_RootOrder: 0 @@ -837,7 +821,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -920,7 +903,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -969,7 +951,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.98, y: 1, z: 2.8} m_LocalScale: {x: 18, y: 23.44351, z: 30} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -1000,7 +981,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 11.65} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 266337116} - {fileID: 1063039922} @@ -1036,7 +1016,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 2 @@ -1052,7 +1031,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1120,7 +1098,6 @@ Transform: m_LocalRotation: {x: -0.0000020191073, y: -0.7071068, z: 0.7071068, w: 0.0000020191073} m_LocalPosition: {x: 2, y: -0.06, z: 3.4799995} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 2 @@ -1150,7 +1127,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1217,7 +1193,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -16.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 2 @@ -1261,7 +1236,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1320,7 +1294,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1823638298} m_RootOrder: 1 @@ -1336,7 +1309,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1401,7 +1373,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.37, y: 0.09998665, z: 16.256203} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1693407631} - {fileID: 1943064970} @@ -1438,7 +1409,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16.47556, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 0 @@ -1476,7 +1446,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1535,7 +1504,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 2 @@ -1551,7 +1519,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1618,7 +1585,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3, y: -0.16, z: 3.1899986} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 0 @@ -1656,7 +1622,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1715,7 +1680,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 6, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 1 @@ -1731,7 +1695,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1777,10 +1740,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: m_LocalPosition.x value: -4.945982 @@ -1793,10 +1752,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.423647 objectReference: {fileID: 0} - - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -1809,6 +1764,14 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 114542892872663716, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: sharedProfile @@ -1854,7 +1817,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1585461826} - {fileID: 848590138} @@ -1893,7 +1855,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 0 @@ -1909,7 +1870,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1994,7 +1954,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -2027,7 +1986,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -22.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 3 @@ -2069,7 +2027,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2126,7 +2083,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.475559, y: 0.09998665, z: 16.256203} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 935026619} - {fileID: 68673008} @@ -2178,7 +2134,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2227,7 +2182,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.9799995, y: -1, z: 2.8} m_LocalScale: {x: 18, y: 23.44351, z: 30} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -2260,7 +2214,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -4.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 0 @@ -2300,7 +2253,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2342,10 +2294,6 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -2 @@ -2358,10 +2306,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 19 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -2374,6 +2318,14 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -2385,19 +2337,14 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: field of view - value: 109.5 + propertyPath: orthographic size + value: 5 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_TargetTexture value: objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: orthographic size - value: 5 - objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_NormalizedViewPortRect.x @@ -2418,6 +2365,16 @@ PrefabInstance: propertyPath: m_NormalizedViewPortRect.height value: 1 objectReference: {fileID: 0} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: field of view + value: 109.5 + objectReference: {fileID: 0} + - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipeline @@ -2426,12 +2383,12 @@ PrefabInstance: type: 2} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.size + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 1 objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2439,11 +2396,6 @@ PrefabInstance: propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 0} - - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -2456,67 +2408,62 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: backgroundColorHDR.b - value: 0.07843138 + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0.182577 + propertyPath: m_Version + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.r - value: 0.23529412 + propertyPath: m_ObsoleteFrameSettings.enableShadow + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSSR + propertyPath: m_ObsoleteFrameSettings.enableContactShadows value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSSAO + propertyPath: m_ObsoleteFrameSettings.enableShadowMask value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runSSRAsync + propertyPath: m_ObsoleteFrameSettings.enableSSR value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableDecals + propertyPath: m_ObsoleteFrameSettings.enableSSAO value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableShadow + propertyPath: m_ObsoleteFrameSettings.enableSubsurfaceScattering value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runSSAOAsync + propertyPath: m_ObsoleteFrameSettings.enableTransmission value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.shaderLitMode + propertyPath: m_ObsoleteFrameSettings.enableAtmosphericScattering value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableDistortion + propertyPath: m_ObsoleteFrameSettings.enableVolumetrics value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableShadowMask + propertyPath: m_ObsoleteFrameSettings.enableReprojectionForVolumetrics value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2526,62 +2473,62 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enablePostprocess + propertyPath: m_ObsoleteFrameSettings.diffuseGlobalDimmer value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableVolumetrics + propertyPath: m_ObsoleteFrameSettings.specularGlobalDimmer value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runLightListAsync + propertyPath: m_ObsoleteFrameSettings.shaderLitMode value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableAsyncCompute + propertyPath: m_ObsoleteFrameSettings.enableTransparentPrepass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransmission + propertyPath: m_ObsoleteFrameSettings.enableMotionVectors value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.diffuseGlobalDimmer + propertyPath: m_ObsoleteFrameSettings.enableObjectMotionVectors value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableMotionVectors + propertyPath: m_ObsoleteFrameSettings.enableDecals value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableOpaqueObjects + propertyPath: m_ObsoleteFrameSettings.enableRoughRefraction value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableContactShadows + propertyPath: m_ObsoleteFrameSettings.enableTransparentPostpass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.specularGlobalDimmer + propertyPath: m_ObsoleteFrameSettings.enableDistortion value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableRoughRefraction + propertyPath: m_ObsoleteFrameSettings.enablePostprocess value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runContactShadowsAsync + propertyPath: m_ObsoleteFrameSettings.enableOpaqueObjects value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2591,88 +2538,88 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransparentPrepass + propertyPath: m_ObsoleteFrameSettings.enableRealtimePlanarReflection value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableObjectMotionVectors + propertyPath: m_ObsoleteFrameSettings.enableAsyncCompute value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransparentPostpass + propertyPath: m_ObsoleteFrameSettings.runLightListAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + propertyPath: m_ObsoleteFrameSettings.runSSRAsync + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSubsurfaceScattering + propertyPath: m_ObsoleteFrameSettings.runSSAOAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runVolumeVoxelizationAsync + propertyPath: m_ObsoleteFrameSettings.runContactShadowsAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableAtmosphericScattering + propertyPath: m_ObsoleteFrameSettings.runVolumeVoxelizationAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableRealtimePlanarReflection + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableDeferredTileAndCluster value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightEvaluation value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableReprojectionForVolumetrics + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightVariants value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableBigTilePrepass + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeMaterialVariants value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightVariants + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableFptlForForwardOpaque value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableFptlForForwardOpaque + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableBigTilePrepass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightEvaluation + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableDeferredTileAndCluster - value: 0 + propertyPath: backgroundColorHDR.r + value: 0.23529412 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeMaterialVariants - value: 0 + propertyPath: backgroundColorHDR.g + value: 0.182577 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: xrLayout - value: 0 + propertyPath: backgroundColorHDR.b + value: 0.07843138 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -2684,6 +2631,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 800 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrLayout + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -2720,7 +2672,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94484690} m_RootOrder: 1 @@ -2736,7 +2687,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2815,7 +2765,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: -6} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 464369562} - {fileID: 817363608} @@ -2850,7 +2799,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -10.5} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 1 @@ -2890,7 +2838,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2921,6 +2868,107 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2003875549 +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 &1132392170045009 GameObject: m_ObjectHideFlags: 0 @@ -2967,7 +3015,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.5, y: 10, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -2982,7 +3029,6 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.5, y: 10, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -3085,6 +3131,53 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0.054901958, g: 0.14509805, b: 0.13433173, a: 0} clearDepth: 1 @@ -3102,18 +3195,15 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 - m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3122,14 +3212,6 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005818916700 @@ -3143,14 +3225,25 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 1 data2: 0 defaultFrameSettings: 0 - m_Version: 8 +--- !u!114 &114777191937075999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132392170045009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -3197,18 +3290,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 ---- !u!114 &114777191937075999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1132392170045009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} - m_Name: - m_EditorClassIdentifier: clearColorMode: 1 backgroundColorHDR: {r: 0.09642992, g: 0.078987196, b: 0.23584908, a: 0} clearDepth: 1 @@ -3226,18 +3307,15 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 - m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 - xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3246,14 +3324,6 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005818916701 @@ -3267,57 +3337,9 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 1 data2: 0 defaultFrameSettings: 0 - m_Version: 8 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset index 57bfd4fe7e4..0decdd2ce68 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset @@ -3,121 +3,31 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} m_Name: HDRP_Default_Sky 1 m_EditorClassIdentifier: - active: 1 - rotation: - m_OverrideState: 0 - m_Value: 0 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 0 - multiplier: - m_OverrideState: 0 - m_Value: 1 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - 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 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - hdriSky: - m_OverrideState: 0 - m_Value: {fileID: 0} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 + rotation: 160 + exposure: 0 + multiplier: 0.2 + resolution: 256 + updateMode: 0 + updatePeriod: 0 + lightingOverride: {fileID: 0} + atmosphericScatteringSettings: + type: 0 + colorMode: 1 + fogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + mipFogMaxMip: 1 + mipFogNear: 0 + mipFogFar: 1000 + linearFogDensity: 1 + linearFogStart: 500 + linearFogEnd: 1000 + expFogDistance: 100 + expFogDensity: 1 + skyHDRI: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset index a5f5dd0b48d..4056100d5db 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset @@ -13,21 +13,13 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -59,9 +51,12 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -71,12 +66,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 0.46608552 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -86,84 +80,10 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset index e37ca7317eb..402320a6482 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset @@ -426,7 +426,7 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0 skyAmbientMode: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 0 windOrientation: m_OverrideState: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity index b2fd68c3a8c..33d4081d9c3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -150,7 +148,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.284, y: -2.0546, z: 0} m_LocalScale: {x: 1.5273, y: 1.5273, z: 1.5273} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 777764088} - {fileID: 1481904499} @@ -190,7 +187,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.32, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 400404840} - {fileID: 611033635} @@ -209,6 +205,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -225,17 +316,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -248,24 +328,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 proxy: - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -278,10 +364,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -299,8 +381,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -377,8 +459,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -464,130 +544,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -608,12 +565,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -657,8 +612,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -676,7 +631,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -710,7 +665,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.201, y: -0.342, z: -1.262} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 229635437} m_RootOrder: 2 @@ -739,12 +693,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -807,7 +759,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: -0.342, z: -0.743} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 2 @@ -836,12 +787,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -904,7 +853,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 973768864} m_RootOrder: 0 @@ -933,12 +881,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1000,7 +946,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.3011, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 5 @@ -1016,12 +961,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1085,7 +1028,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7390002, y: -0.44000039, z: -0.344} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1667517191} - {fileID: 703441991} @@ -1106,63 +1048,153 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_ProbeSettings: - frustum: - fieldOfViewMode: 1 - fixedValue: 90 - automaticScale: 1 - viewerScale: 1 - type: 0 - mode: 1 - realtimeMode: 0 - lighting: - multiplier: 1 - weight: 1 - lightLayer: 1 - fadeDistance: 10000 - rangeCompressionFactor: 1 - influence: - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_ProbeSettings: + frustum: + fieldOfViewMode: 1 + fixedValue: 90 + automaticScale: 1 + viewerScale: 1 + type: 0 + mode: 1 + realtimeMode: 0 + lighting: + multiplier: 1 + weight: 1 + lightLayer: 1 + fadeDistance: 10000 + rangeCompressionFactor: 1 + influence: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -1175,10 +1207,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1196,8 +1224,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1274,8 +1302,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1361,130 +1387,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -1505,12 +1408,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1554,8 +1455,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -1573,7 +1474,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -1607,7 +1508,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1342837068} m_RootOrder: 0 @@ -1636,12 +1536,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1704,7 +1602,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.617, y: -0.342, z: -1.244} m_LocalScale: {x: 0.23569697, y: 0.23569697, z: 0.23569697} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 4 @@ -1733,12 +1630,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1801,7 +1696,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15513, y: 0.15513, z: 0.15513} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 703441991} m_RootOrder: 0 @@ -1830,12 +1724,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1897,7 +1789,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.54, y: -4.2893, z: 0} m_LocalScale: {x: 385.1731, y: 3.8790157, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 2 @@ -1913,12 +1804,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1980,7 +1869,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 21096330} m_RootOrder: 0 @@ -1996,12 +1884,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2063,7 +1949,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.638, y: 0.17, z: -1.724} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1091291962} m_Father: {fileID: 1098561660} @@ -2081,16 +1966,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2105,9 +1996,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2124,9 +2012,7 @@ 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 @@ -2157,14 +2043,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2180,17 +2060,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &437088011 Light: m_ObjectHideFlags: 0 @@ -2250,7 +2120,6 @@ 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 &475434060 @@ -2283,16 +2152,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + 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_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2307,9 +2182,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2326,9 +2198,7 @@ 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 @@ -2359,14 +2229,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -2382,17 +2246,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &475434063 Light: m_ObjectHideFlags: 0 @@ -2452,7 +2306,6 @@ 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 &475434064 @@ -2465,7 +2318,6 @@ Transform: m_LocalRotation: {x: 0.67753434, y: -0.27373418, z: 0.31773764, w: 0.6042017} m_LocalPosition: {x: 5.5331078, y: -15.559323, z: 38.527405} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -2499,7 +2351,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1183693015} m_RootOrder: 0 @@ -2528,12 +2379,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2595,7 +2444,6 @@ Transform: m_LocalRotation: {x: 0.1877043, y: -0.2808559, z: -0.09246844, w: 0.9366625} m_LocalPosition: {x: 0.043, y: 0.572, z: -2.515} m_LocalScale: {x: 4.265915, y: 4.265915, z: 4.265915} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1227910975} m_Father: {fileID: 1481904499} @@ -2613,16 +2461,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2637,9 +2491,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2656,9 +2507,7 @@ 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 @@ -2689,14 +2538,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2712,17 +2555,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &513507484 Light: m_ObjectHideFlags: 0 @@ -2782,7 +2615,6 @@ 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 &516317389 @@ -2815,7 +2647,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.78, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1894137919} - {fileID: 1939633831} @@ -2836,6 +2667,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -2852,17 +2778,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -2875,24 +2790,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 proxy: - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2905,10 +2826,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2926,8 +2843,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -3004,8 +2921,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -3091,130 +3006,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -3235,12 +3027,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3284,8 +3074,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -3303,7 +3093,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -3336,7 +3126,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.87, y: -0.44842, z: 0} m_LocalScale: {x: 327.0256, y: 3.8790162, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 0 @@ -3352,12 +3141,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3420,7 +3207,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1891725936} m_RootOrder: 0 @@ -3449,12 +3235,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3516,7 +3300,6 @@ Transform: m_LocalRotation: {x: -0.00000043315177, y: 0.91290903, z: 0.40816325, w: -0.00000021523823} m_LocalPosition: {x: -0.062, y: -1.032, z: -0.534} m_LocalScale: {x: 1.9597181, y: 0.25220236, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1446512204} m_Father: {fileID: 21096330} @@ -3534,16 +3317,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3558,9 +3347,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3577,9 +3363,7 @@ 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 @@ -3610,14 +3394,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3633,17 +3411,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 1 --- !u!108 &611033640 Light: m_ObjectHideFlags: 0 @@ -3703,7 +3471,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.2520332} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &614162063 @@ -3734,7 +3501,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1657149774} m_RootOrder: 0 @@ -3750,12 +3516,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3817,7 +3581,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.638, y: 0.17, z: -1.724} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 854704549} m_Father: {fileID: 229635437} @@ -3835,16 +3598,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Intensity: 50 - m_EnableSpotReflector: 0 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 + m_Intensity: 50 + m_EnableSpotReflector: 0 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3859,9 +3628,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3878,9 +3644,7 @@ 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 @@ -3911,14 +3675,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3934,17 +3692,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &617468368 Light: m_ObjectHideFlags: 0 @@ -4004,7 +3752,6 @@ 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 &681941806 @@ -4035,7 +3782,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.70710677, w: 0.7071068} m_LocalPosition: {x: -10.7737, y: -2.4550998, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 15 @@ -4073,12 +3819,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4132,7 +3876,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: 0, z: -1.362} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 363705271} m_Father: {fileID: 229635437} @@ -4150,16 +3893,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4174,9 +3923,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4193,9 +3939,7 @@ 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 @@ -4226,14 +3970,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4249,17 +3987,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &703441994 Light: m_ObjectHideFlags: 0 @@ -4319,7 +4047,6 @@ 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 &777764087 @@ -4352,7 +4079,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.32, y: -0.44000039, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1459415260} - {fileID: 1342837068} @@ -4371,6 +4097,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -4387,17 +4208,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -4410,24 +4220,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4440,10 +4256,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4461,8 +4273,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4539,8 +4351,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -4626,130 +4436,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -4770,12 +4457,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4819,8 +4504,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -4838,7 +4523,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -4886,7 +4571,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1892780867} m_RootOrder: 0 @@ -4915,12 +4599,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4983,7 +4665,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15512997, y: 0.15512997, z: 0.15512997} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 617468365} m_RootOrder: 0 @@ -5012,12 +4693,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5079,7 +4758,6 @@ Transform: m_LocalRotation: {x: 0.6015178, y: 0.4811885, z: 0.2609177, w: 0.5818557} m_LocalPosition: {x: -0.763, y: -0.111, z: -0.938} m_LocalScale: {x: 1.7410467, y: 0, z: 0} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 124817707} m_Father: {fileID: 516317390} @@ -5097,16 +4775,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Intensity: 50 - m_EnableSpotReflector: 1 - m_LuxAtDistance: 1 - m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 - m_LightDimmer: 1 - m_VolumetricDimmer: 1 + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 + m_Intensity: 50 + m_EnableSpotReflector: 1 + m_LuxAtDistance: 1 + m_InnerSpotPercent: 0 + m_LightDimmer: 1 + m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -5121,9 +4805,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -5140,9 +4821,7 @@ 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 @@ -5173,14 +4852,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -5196,17 +4869,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 + showAdditionalSettings: 1 --- !u!108 &973768867 Light: m_ObjectHideFlags: 0 @@ -5266,7 +4929,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &980292724 @@ -5297,7 +4959,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.4602, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 4 @@ -5313,12 +4974,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5380,7 +5039,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1081795512} m_RootOrder: 0 @@ -5396,12 +5054,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5461,7 +5117,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.284, y: 1, z: 0} m_LocalScale: {x: 1.5273, y: 1.5273, z: 1.5273} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1098561660} - {fileID: 1102244886} @@ -5501,7 +5156,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 8.250001, y: 0.5199999, z: -0.364} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1509218596} m_Father: {fileID: 1022855023} @@ -5519,6 +5173,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -5535,17 +5284,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -5558,24 +5296,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 proxy: - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -5588,10 +5332,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -5609,8 +5349,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -5687,8 +5427,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -5774,130 +5512,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -5918,12 +5533,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5967,8 +5580,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -5986,7 +5599,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6021,7 +5634,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.78, y: -0.44000006, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1003728041} - {fileID: 1640950923} @@ -6042,33 +5654,117 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_ProbeSettings: - frustum: - fieldOfViewMode: 1 - fixedValue: 90 - automaticScale: 1 - viewerScale: 1 - type: 0 - mode: 1 - realtimeMode: 0 - lighting: - multiplier: 1 - weight: 1 - lightLayer: 1 - fadeDistance: 10000 - rangeCompressionFactor: 1 - influence: - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_ProbeSettings: + frustum: + fieldOfViewMode: 1 + fixedValue: 90 + automaticScale: 1 + viewerScale: 1 + type: 0 + mode: 1 + realtimeMode: 0 + lighting: + multiplier: 1 + weight: 1 + lightLayer: 1 + fadeDistance: 10000 + rangeCompressionFactor: 1 + influence: m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -6081,24 +5777,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6111,10 +5813,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6132,8 +5830,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6210,8 +5908,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -6297,130 +5993,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -6441,12 +6014,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6490,8 +6061,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -6509,7 +6080,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6543,7 +6114,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15512997, y: 0.15512997, z: 0.15512997} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 437088008} m_RootOrder: 0 @@ -6572,12 +6142,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6641,8 +6209,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -6660,7 +6228,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6675,7 +6243,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7390002, y: 0.5199999, z: -0.344} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1701459356} - {fileID: 1918702563} @@ -6696,33 +6263,117 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_ProbeSettings: - frustum: - fieldOfViewMode: 1 - fixedValue: 90 - automaticScale: 1 - viewerScale: 1 - type: 0 - mode: 1 - realtimeMode: 0 - lighting: - multiplier: 1 - weight: 1 - lightLayer: 1 - fadeDistance: 10000 - rangeCompressionFactor: 1 - influence: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_ProbeSettings: + frustum: + fieldOfViewMode: 1 + fixedValue: 90 + automaticScale: 1 + viewerScale: 1 + type: 0 + mode: 1 + realtimeMode: 0 + lighting: + multiplier: 1 + weight: 1 + lightLayer: 1 + fadeDistance: 10000 + rangeCompressionFactor: 1 + influence: m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -6735,24 +6386,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 proxy: - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6765,10 +6422,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6786,8 +6439,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6864,8 +6517,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -6951,130 +6602,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -7095,12 +6623,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7164,7 +6690,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6299998, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1363967057} - {fileID: 2002286226} @@ -7186,6 +6711,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -7202,17 +6822,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -7225,24 +6834,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 proxy: - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -7255,10 +6870,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -7276,8 +6887,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -7354,8 +6965,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -7441,130 +7050,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -7585,12 +7071,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7634,8 +7118,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -7653,7 +7137,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -7687,7 +7171,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15513, y: 0.15513, z: 0.15513} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1918702563} m_RootOrder: 0 @@ -7716,12 +7199,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7783,7 +7264,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10.062, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 8 @@ -7799,12 +7279,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7866,7 +7344,6 @@ Transform: m_LocalRotation: {x: 0.25129914, y: 0.19393967, z: 0.18873338, w: 0.92930937} m_LocalPosition: {x: -0.118, y: 0.541, z: -2.237} m_LocalScale: {x: 25.55, y: 25.55, z: 25.55} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1477123744} m_Father: {fileID: 1102244886} @@ -7884,16 +7361,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -7908,9 +7391,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -7927,9 +7407,7 @@ 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 @@ -7960,14 +7438,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7983,17 +7455,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &1162519692 Light: m_ObjectHideFlags: 0 @@ -8053,7 +7515,6 @@ 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 &1180222689 @@ -8084,7 +7545,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.3806, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790162, y: 193.95079, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 3 @@ -8100,12 +7560,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8167,7 +7625,6 @@ Transform: m_LocalRotation: {x: -0.15337509, y: -0.11439086, z: 0.036997784, w: 0.9808272} m_LocalPosition: {x: 0.52, y: -1.015, z: 0.098} m_LocalScale: {x: 1.741047, y: 0, z: 0} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 505559235} m_Father: {fileID: 516317390} @@ -8185,16 +7642,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -8209,9 +7672,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -8228,9 +7688,7 @@ 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 @@ -8261,14 +7719,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -8284,17 +7736,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 + showAdditionalSettings: 1 --- !u!108 &1183693018 Light: m_ObjectHideFlags: 0 @@ -8354,7 +7796,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1227157678 @@ -8385,7 +7826,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.46, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 12 @@ -8425,12 +7865,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8485,7 +7923,6 @@ Transform: m_LocalRotation: {x: -0.18770431, y: 0.2808559, z: 0.09246845, w: 0.9366625} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03636499, y: 0.036364995, z: 0.03636499} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 513507481} m_RootOrder: 0 @@ -8514,12 +7951,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8581,7 +8016,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.3870299, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 11 @@ -8621,12 +8055,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8681,7 +8113,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: -0.342, z: -0.743} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 2 @@ -8710,12 +8141,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8777,7 +8206,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 7.307, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 13 @@ -8817,12 +8245,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8877,7 +8303,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1640950923} m_RootOrder: 0 @@ -8906,12 +8331,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8973,7 +8396,6 @@ Transform: m_LocalRotation: {x: -0.00000043315177, y: 0.91290903, z: 0.40816325, w: -0.00000021523823} m_LocalPosition: {x: -0.062, y: -1.032, z: -0.534} m_LocalScale: {x: 1.9597181, y: 0.25220236, z: 0.01} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 307748058} m_Father: {fileID: 777764088} @@ -8991,16 +8413,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -9015,9 +8443,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -9034,9 +8459,7 @@ 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 @@ -9067,14 +8490,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -9090,17 +8507,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 1 --- !u!108 &1342837071 Light: m_ObjectHideFlags: 0 @@ -9160,7 +8567,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.2520332} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1349151176 @@ -9192,7 +8598,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1939633831} m_RootOrder: 0 @@ -9221,12 +8626,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9288,7 +8691,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 0 @@ -9304,12 +8706,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9371,7 +8771,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.081, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 9 @@ -9411,12 +8810,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9470,7 +8867,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.8, y: 3.3924, z: 0} m_LocalScale: {x: 330.4813, y: 3.8790157, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 1 @@ -9486,12 +8882,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9554,7 +8948,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 611033635} m_RootOrder: 0 @@ -9583,12 +8976,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9650,7 +9041,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 777764088} m_RootOrder: 0 @@ -9666,12 +9056,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9734,7 +9122,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1162519689} m_RootOrder: 0 @@ -9763,12 +9150,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9832,7 +9217,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6299998, y: -0.44000039, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1651282835} - {fileID: 513507481} @@ -9854,6 +9238,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -9864,23 +9343,12 @@ MonoBehaviour: mode: 1 realtimeMode: 0 lighting: - multiplier: 1 - weight: 1 - lightLayer: 1 - fadeDistance: 10000 - rangeCompressionFactor: 1 - influence: - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 + multiplier: 1 + weight: 1 + lightLayer: 1 + fadeDistance: 10000 + rangeCompressionFactor: 1 + influence: m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -9893,24 +9361,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -9923,10 +9397,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9944,8 +9414,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -10022,8 +9492,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -10109,130 +9577,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -10253,12 +9598,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10302,8 +9645,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -10321,7 +9664,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -10352,7 +9695,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.25} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 525944184} - {fileID: 1432237597} @@ -10401,7 +9743,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1033495927} m_RootOrder: 0 @@ -10417,12 +9758,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10484,7 +9823,6 @@ Transform: m_LocalRotation: {x: -0.15337509, y: -0.11439086, z: 0.036997784, w: 0.9808272} m_LocalPosition: {x: 0.52, y: -1.015, z: 0.098} m_LocalScale: {x: 1.741047, y: 0, z: 0} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1588342439} m_Father: {fileID: 1081795512} @@ -10502,16 +9840,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -10526,9 +9870,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -10545,9 +9886,7 @@ 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 @@ -10578,14 +9917,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10601,17 +9934,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 + showAdditionalSettings: 1 --- !u!108 &1552828732 Light: m_ObjectHideFlags: 0 @@ -10671,7 +9994,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1588342438 @@ -10703,7 +10025,6 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1552828729} m_RootOrder: 0 @@ -10732,12 +10053,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10782,22 +10101,6 @@ PrefabInstance: propertyPath: m_Name value: Background objectReference: {fileID: 0} - - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.x - value: 1240.0674 - objectReference: {fileID: 0} - - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.y - value: 744.0404 - objectReference: {fileID: 0} - - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.z - value: 49.60269 - objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -10810,10 +10113,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 5.6 objectReference: {fileID: 0} - - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -10826,6 +10125,26 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} + propertyPath: m_LocalScale.x + value: 1240.0674 + objectReference: {fileID: 0} + - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} + propertyPath: m_LocalScale.y + value: 744.0404 + objectReference: {fileID: 0} + - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} + propertyPath: m_LocalScale.z + value: 49.60269 + objectReference: {fileID: 0} - target: {fileID: 23096287020260212, guid: e6be141ec19d3554489da286b19b90b2, type: 3} propertyPath: m_Materials.Array.data[0] @@ -10866,7 +10185,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.1419, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 6 @@ -10882,12 +10200,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10949,7 +10265,6 @@ Transform: m_LocalRotation: {x: 0.35460198, y: 0.72358406, z: 0.5515062, w: 0.21569538} m_LocalPosition: {x: -0.062, y: 0.698, z: -1.249} m_LocalScale: {x: 1.7410431, y: 0, z: 0} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1336388560} m_Father: {fileID: 1081795512} @@ -10967,16 +10282,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -10991,9 +10312,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11010,9 +10328,7 @@ 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 @@ -11043,14 +10359,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11066,17 +10376,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 + showAdditionalSettings: 1 --- !u!108 &1640950926 Light: m_ObjectHideFlags: 0 @@ -11136,7 +10436,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.4778197} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1641932329 @@ -11167,7 +10466,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.70710677, w: 0.7071068} m_LocalPosition: {x: -10.7737, y: 1.3919002, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 14 @@ -11205,12 +10503,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11264,7 +10560,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 0 @@ -11280,12 +10575,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11349,7 +10642,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 8.250001, y: -0.44000039, z: -0.364} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 614162064} m_Father: {fileID: 834778} @@ -11367,6 +10659,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -11383,17 +10770,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -11406,24 +10782,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -11436,10 +10818,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -11457,8 +10835,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -11535,8 +10913,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -11622,130 +10998,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -11766,12 +11019,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11815,8 +11066,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 0 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -11834,7 +11085,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -11868,11 +11119,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: eaf61362679e76e4f929f6c59bb804e1, type: 2} + sharedProfile: {fileID: 0} --- !u!4 &1664385614 Transform: m_ObjectHideFlags: 0 @@ -11883,7 +11134,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -11916,7 +11166,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 229635437} m_RootOrder: 0 @@ -11932,12 +11181,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12000,12 +11247,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12049,7 +11294,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1098561660} m_RootOrder: 0 @@ -12097,7 +11341,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -12130,7 +11373,6 @@ Transform: m_LocalRotation: {x: 0.6015178, y: 0.4811885, z: 0.2609177, w: 0.5818557} m_LocalPosition: {x: -0.763, y: -0.111, z: -0.938} m_LocalScale: {x: 1.7410467, y: 0, z: 0} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 580852481} m_Father: {fileID: 1081795512} @@ -12148,16 +11390,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12172,9 +11420,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12191,9 +11436,7 @@ 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 @@ -12224,14 +11467,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12247,17 +11484,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 + showAdditionalSettings: 1 --- !u!108 &1891725939 Light: m_ObjectHideFlags: 0 @@ -12317,7 +11544,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1892780866 @@ -12348,7 +11574,6 @@ Transform: m_LocalRotation: {x: 0.25129914, y: 0.19393967, z: 0.18873338, w: 0.92930937} m_LocalPosition: {x: -0.118, y: 0.541, z: -2.237} m_LocalScale: {x: 25.55, y: 25.55, z: 25.55} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 833411595} m_Father: {fileID: 1481904499} @@ -12366,16 +11591,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12390,9 +11621,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12409,9 +11637,7 @@ 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 @@ -12442,14 +11668,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12465,17 +11685,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &1892780870 Light: m_ObjectHideFlags: 0 @@ -12535,7 +11745,6 @@ 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 &1894137918 @@ -12566,7 +11775,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 516317390} m_RootOrder: 0 @@ -12582,12 +11790,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12649,7 +11855,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: 0, z: -1.362} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1104315614} m_Father: {fileID: 1098561660} @@ -12667,16 +11872,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12691,9 +11902,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12710,9 +11918,7 @@ 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 @@ -12743,14 +11949,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12766,17 +11966,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &1918702566 Light: m_ObjectHideFlags: 0 @@ -12836,7 +12026,6 @@ 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 &1939633830 @@ -12867,7 +12056,6 @@ Transform: m_LocalRotation: {x: 0.35460198, y: 0.72358406, z: 0.5515062, w: 0.21569538} m_LocalPosition: {x: -0.062, y: 0.698, z: -1.249} m_LocalScale: {x: 1.7410431, y: 0, z: 0} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1349151177} m_Father: {fileID: 516317390} @@ -12885,16 +12073,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12909,9 +12103,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12928,9 +12119,7 @@ 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 @@ -12961,14 +12150,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12984,17 +12167,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 + showAdditionalSettings: 1 --- !u!108 &1939633834 Light: m_ObjectHideFlags: 0 @@ -13054,7 +12227,6 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.4778197} m_UseBoundingSphereOverride: 1 - m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &1965177827 @@ -13064,10 +12236,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -1.28 @@ -13080,10 +12248,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -16.42 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -13096,6 +12260,14 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -13112,13 +12284,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: far clip plane - value: 200 + propertyPath: orthographic size + value: 7.27 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic size - value: 7.27 + propertyPath: far clip plane + value: 200 objectReference: {fileID: 0} - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -13142,23 +12314,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 8 + propertyPath: backgroundColorHDR.r + value: 0.41902542 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 1 + propertyPath: backgroundColorHDR.g + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0 + propertyPath: backgroundColorHDR.b + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.r - value: 0.41902542 + propertyPath: m_Version + value: 7 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -13201,7 +12373,6 @@ Transform: m_LocalRotation: {x: -0.18770431, y: 0.2808559, z: 0.09246845, w: 0.9366625} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03636499, y: 0.036364995, z: 0.03636499} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2002286226} m_RootOrder: 0 @@ -13230,12 +12401,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -13298,7 +12467,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.617, y: -0.342, z: -1.244} m_LocalScale: {x: 0.23569697, y: 0.23569697, z: 0.23569697} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 4 @@ -13327,12 +12495,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -13394,7 +12560,6 @@ Transform: m_LocalRotation: {x: 0.1877043, y: -0.2808559, z: -0.09246844, w: 0.9366625} m_LocalPosition: {x: 0.043, y: 0.572, z: -2.515} m_LocalScale: {x: 4.265915, y: 4.265915, z: 4.265915} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1975323122} m_Father: {fileID: 1102244886} @@ -13412,16 +12577,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -13436,9 +12607,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -13455,9 +12623,7 @@ 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 @@ -13488,14 +12654,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -13511,17 +12671,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &2002286229 Light: m_ObjectHideFlags: 0 @@ -13581,7 +12731,6 @@ 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 &2024496926 @@ -13612,7 +12761,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.234, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 10 @@ -13652,12 +12800,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -13712,7 +12858,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.201, y: -0.342, z: -1.262} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1098561660} m_RootOrder: 2 @@ -13741,12 +12886,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -13808,7 +12951,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.2215, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 7 @@ -13824,12 +12966,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset deleted file mode 100644 index 424b5fccbcf..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2802844970268307975 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 ---- !u!114 &11400000 -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: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Scene Settings Profile - m_EditorClassIdentifier: - components: - - {fileID: -2802844970268307975} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta deleted file mode 100644 index aa5476f6bb6..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaf61362679e76e4f929f6c59bb804e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta deleted file mode 100644 index 9b57dbf74ce..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2cc02d11705d5db45ad1d2c20eeaff28 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity index dd4b39a1a8a..6d8cfd4ca65 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -153,7 +151,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.9772458, y: 1.2323846, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 6 @@ -191,12 +188,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -268,7 +263,6 @@ Transform: m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133565904} m_RootOrder: 0 @@ -285,16 +279,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -309,9 +309,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -328,9 +325,7 @@ 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 @@ -361,14 +356,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -384,17 +373,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &126516509 Light: m_ObjectHideFlags: 0 @@ -454,7 +433,6 @@ 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 &201797804 @@ -485,7 +463,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133565904} m_RootOrder: 1 @@ -502,16 +479,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -526,9 +509,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -545,9 +525,7 @@ 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 @@ -578,14 +556,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -601,17 +573,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &201797808 Light: m_ObjectHideFlags: 0 @@ -671,7 +633,6 @@ 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 &269421424 @@ -703,7 +664,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.757613, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 2 @@ -741,12 +701,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -819,7 +777,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.061559, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 3 @@ -857,12 +814,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -935,7 +890,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642561276} m_RootOrder: 0 @@ -950,9 +904,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &335665651 MeshRenderer: @@ -965,12 +919,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1030,7 +982,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1371258325} - {fileID: 2113193874} @@ -1075,7 +1026,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.526878, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 5 @@ -1113,12 +1063,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1191,7 +1139,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1347699, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 4 @@ -1229,12 +1176,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1307,7 +1252,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2020093, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 9 @@ -1345,12 +1289,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1425,72 +1367,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 1835560861516 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 - m_Version: 8 + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -1537,6 +1414,51 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 1835560861516 + data2: 4539628424389459968 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 --- !u!114 &717369283 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1553,23 +1475,16 @@ MonoBehaviour: TargetWidth: 900 TargetHeight: 300 PerPixelCorrectnessThreshold: 0.001 - PerPixelGammaThreshold: 0.003921569 - PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.0001 - IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 - UseBackBuffer: 0 - ImageResolution: 0 - ActiveImageTests: 1 - ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 waitFrames: 0 xrCompatible: 1 - xrThresholdMultiplier: 1 checkMemoryAllocation: 0 + xrThresholdMultiplier: 1 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} --- !u!20 &717369285 @@ -1625,7 +1540,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -7.38} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1666,7 +1580,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.004, y: 1.494, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 8 @@ -1711,12 +1624,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1760,55 +1671,6 @@ MonoBehaviour: forceTargetDimensions: {x: 200, y: 150} overrideTestSettings: 0 textMesh: {fileID: 745353039} ---- !u!1 &1099230126 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1099230128} - - component: {fileID: 1099230127} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1099230127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1099230126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: e7a5716611aa9124aa74579682e9613f, type: 2} ---- !u!4 &1099230128 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1099230126} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1133565903 GameObject: m_ObjectHideFlags: 0 @@ -1835,7 +1697,6 @@ Transform: m_LocalRotation: {x: -0.000000014901161, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 126516506} - {fileID: 201797805} @@ -1870,7 +1731,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 0 @@ -1886,12 +1746,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1954,7 +1812,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4902725, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 0 @@ -1992,12 +1849,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2069,7 +1924,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 3 @@ -2085,12 +1939,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2152,7 +2004,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 4 @@ -2168,12 +2019,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2235,7 +2084,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 2 @@ -2251,12 +2099,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2316,7 +2162,6 @@ Transform: m_LocalRotation: {x: -0.7660445, y: 0, z: 0, w: 0.64278764} m_LocalPosition: {x: 0, y: 0, z: 2.68} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 335665649} - {fileID: 1941161074} @@ -2351,7 +2196,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 1 @@ -2367,12 +2211,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2435,7 +2277,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.9567593, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 10 @@ -2473,12 +2314,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2548,7 +2387,6 @@ Transform: m_LocalRotation: {x: 0.0000007152557, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1268796610} - {fileID: 1673723394} @@ -2587,7 +2425,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 5 @@ -2603,12 +2440,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2669,7 +2504,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642561276} m_RootOrder: 1 @@ -2686,6 +2520,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 20, y: 0.01, z: 20} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 1 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 1 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -2702,17 +2631,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 20, y: 0.01, z: 20} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -2725,24 +2643,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} + m_BoxSize: {x: 20, y: 0.01, z: 20} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0.00000014883372, z: -0.000000009804136} mirrorRotationProxySpace: {x: -0.7071068, y: 0, z: 0, w: 0.70710677} - resolutionScalable: - m_Override: 512 - m_UseOverride: 1 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2755,10 +2679,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2776,8 +2696,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 1 + farClipPlane: 1000 + nearClipPlane: 1 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2854,8 +2774,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -2941,136 +2859,13 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 20, y: 0.01, z: 20} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 1 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 1 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} - m_PlanarProbeVersion: 7 + m_EditorOnlyData: 0 + m_PlanarProbeVersion: 6 m_ObsoleteCaptureNearPlane: 1 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} --- !u!1 &2041147246 GameObject: m_ObjectHideFlags: 0 @@ -3100,7 +2895,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9772458, y: 1.2323846, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 7 @@ -3138,12 +2932,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3216,7 +3008,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.830824, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 1 @@ -3254,12 +3045,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 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/2206_PlanarReflectionVFace/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset deleted file mode 100644 index e4d84e0f72c..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -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: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Global Volume Profile - m_EditorClassIdentifier: - components: - - {fileID: 8615675033778428043} ---- !u!114 &8615675033778428043 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta deleted file mode 100644 index 62d8ea524db..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e7a5716611aa9124aa74579682e9613f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset index ab65c9b4760..0351529a4de 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset @@ -33,6 +33,8 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -42,12 +44,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -57,18 +58,28 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 top: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0.3962264, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 middle: m_OverrideState: 1 m_Value: {r: 0.040939845, g: 0.23264207, b: 0.3773585, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 bottom: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 gradientDiffusion: m_OverrideState: 1 m_Value: 1 @@ -88,33 +99,43 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - directionalTransmissionMultiplier: - m_OverrideState: 0 - m_Value: 1 + min: 0 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 + min: 0 + max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 + min: 0 + max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 + min: 0 + max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 + min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 + min: 0 --- !u!114 &114265733008192460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -131,6 +152,8 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -140,12 +163,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -155,24 +177,37 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 + min: 0 + max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -192,18 +227,6 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 3 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta deleted file mode 100644 index e497014c27e..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ca8ec8257727b242aa2c3bc221eecf5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity index 7f1b3e7ed03..75af5f53f46 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity @@ -119,8 +119,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -153,7 +151,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.757613, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 2 @@ -209,12 +206,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -268,7 +263,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 5 @@ -284,12 +278,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -351,7 +343,6 @@ Transform: m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299818200} m_RootOrder: 0 @@ -368,16 +359,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -392,9 +389,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -411,9 +405,7 @@ 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 @@ -444,14 +436,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -467,17 +453,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &258139814 Light: m_ObjectHideFlags: 0 @@ -537,7 +513,6 @@ 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 &346223608 @@ -569,7 +544,6 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 870276854} m_RootOrder: 1 @@ -584,9 +558,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 3 m_Convex: 0 - m_CookingOptions: 30 + m_CookingOptions: 14 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &346223611 MeshRenderer: @@ -599,12 +573,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -666,7 +638,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 0 @@ -682,12 +653,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -749,7 +718,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299818200} m_RootOrder: 1 @@ -766,16 +734,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -790,9 +764,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -809,9 +780,7 @@ 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 @@ -842,14 +811,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -865,17 +828,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &550499123 Light: m_ObjectHideFlags: 0 @@ -935,7 +888,6 @@ 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 &660003400 @@ -974,7 +926,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.5130266, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 8 @@ -1037,12 +988,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1094,7 +1043,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1245386076} - {fileID: 1892878110} @@ -1136,7 +1084,6 @@ Transform: m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} m_LocalPosition: {x: 0, y: 0.63, z: 2.17} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1345844771} - {fileID: 346223609} @@ -1171,7 +1118,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 1 @@ -1187,12 +1133,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1255,7 +1199,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1469717, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 4 @@ -1311,12 +1254,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1371,7 +1312,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4902725, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 0 @@ -1427,12 +1367,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1484,7 +1422,6 @@ Transform: m_LocalRotation: {x: 0.0000007152557, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 359289198} - {fileID: 1151135188} @@ -1521,7 +1458,6 @@ Transform: m_LocalRotation: {x: -0.000000014901161, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 258139811} - {fileID: 550499120} @@ -1556,7 +1492,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.00000011920929, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 870276854} m_RootOrder: 0 @@ -1573,6 +1508,101 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_Shape: 0 + m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 15.122394 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 0 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 1 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 1 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 1 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 1 + runSSRAsync: 1 + runSSAOAsync: 1 + runContactShadowsAsync: 1 + runVolumeVoxelizationAsync: 1 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 23 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1589,17 +1619,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_Shape: 0 - m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 15.122394 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1612,24 +1631,30 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - proxy: m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 + m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 15.122394 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 + m_Shape: 0 + m_BoxSize: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} - resolutionScalable: - m_Override: 512 - m_UseOverride: 0 - m_Level: 0 - resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -1642,10 +1667,6 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1663,8 +1684,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlaneRaw: 1000 - nearClipPlaneRaw: 0.3 + farClipPlane: 1000 + nearClipPlane: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1741,8 +1762,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - roughReflections: 1 - distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1828,130 +1847,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_SHForNormalization: - sh[ 0]: 0 - sh[ 1]: 0 - sh[ 2]: 0 - sh[ 3]: 0 - sh[ 4]: 0 - sh[ 5]: 0 - sh[ 6]: 0 - sh[ 7]: 0 - sh[ 8]: 0 - sh[ 9]: 0 - sh[10]: 0 - sh[11]: 0 - sh[12]: 0 - sh[13]: 0 - sh[14]: 0 - sh[15]: 0 - sh[16]: 0 - sh[17]: 0 - sh[18]: 0 - sh[19]: 0 - sh[20]: 0 - sh[21]: 0 - sh[22]: 0 - sh[23]: 0 - sh[24]: 0 - sh[25]: 0 - sh[26]: 0 - m_HasValidSHForNormalization: 0 - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_Shape: 0 - m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 15.122394 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 0 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 1 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 1 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 1 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 1 - runSSRAsync: 1 - runSSAOAsync: 1 - runContactShadowsAsync: 1 - runVolumeVoxelizationAsync: 1 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 23 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_EditorOnlyData: 0 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 @@ -1971,8 +1867,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 2 - m_RefreshMode: 2 + m_Mode: 1 + m_RefreshMode: 1 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -1990,59 +1886,10 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 1 + m_RenderDynamicObjects: 0 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} ---- !u!1 &1358735759 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1358735761} - - component: {fileID: 1358735760} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1358735760 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358735759} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: f2b49193f73321a469fe116f6f4ba701, type: 2} ---- !u!4 &1358735761 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358735759} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1582879334 GameObject: m_ObjectHideFlags: 0 @@ -2072,7 +1919,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.061559, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 3 @@ -2128,12 +1974,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2187,7 +2031,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 2 @@ -2203,12 +2046,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2271,7 +2112,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2159861, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 9 @@ -2327,12 +2167,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2387,7 +2225,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.830824, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 1 @@ -2443,12 +2280,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2503,7 +2338,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.9707361, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 10 @@ -2559,12 +2393,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2618,7 +2450,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 3 @@ -2634,12 +2465,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2702,7 +2531,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9894476, y: 1.2445863, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 7 @@ -2758,12 +2586,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2817,7 +2643,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 4 @@ -2833,12 +2658,10 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2901,7 +2724,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.526878, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 5 @@ -2957,12 +2779,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3017,7 +2837,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.9894476, y: 1.2445863, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 6 @@ -3073,12 +2892,10 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3182,23 +2999,16 @@ MonoBehaviour: TargetWidth: 900 TargetHeight: 300 PerPixelCorrectnessThreshold: 0.001 - PerPixelGammaThreshold: 0.003921569 - PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.0001 - IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 - UseBackBuffer: 0 - ImageResolution: 0 - ActiveImageTests: 1 - ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 waitFrames: 0 xrCompatible: 1 - xrThresholdMultiplier: 1 checkMemoryAllocation: 0 + xrThresholdMultiplier: 1 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} --- !u!114 &2123398363 @@ -3213,72 +3023,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70280697347933 - data2: 4539628424926265344 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 - m_Version: 8 + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -3325,6 +3070,51 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70280697347933 + data2: 4539628424926265344 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 --- !u!4 &2123398364 Transform: m_ObjectHideFlags: 0 @@ -3335,7 +3125,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -7.38} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset deleted file mode 100644 index 1da793d75f9..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset +++ /dev/null @@ -1,47 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6982758880431881621 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 ---- !u!114 &11400000 -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: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Global Volume Profile - m_EditorClassIdentifier: - components: - - {fileID: -6982758880431881621} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta deleted file mode 100644 index 5d1db2b718b..00000000000 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f2b49193f73321a469fe116f6f4ba701 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset index 696162dbf06..562b56ea927 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset @@ -29,21 +29,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 2 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 2 @@ -60,15 +52,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - directionalTransmissionMultiplier: - m_OverrideState: 0 - m_Value: 1 + min: 0 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -103,9 +96,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -115,12 +111,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -130,24 +125,37 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 + min: 0 + max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0, g: 1, b: 0.09278011, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.88122773, g: 1, b: 0, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset index 57a6000fa7b..40d18ef6e46 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -118,15 +119,19 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 + min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 + min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} + min: 0 + max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -151,6 +156,7 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 + min: 0 --- !u!114 &-5120183026951368462 MonoBehaviour: m_ObjectHideFlags: 3 @@ -164,21 +170,13 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -211,9 +209,12 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 rotation: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -223,9 +224,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.0145767 + min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.38545167, y: 0.41750622, z: 0.5} @@ -238,35 +241,34 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 0} - distortionMode: + enableDistortion: m_OverrideState: 0 m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollOrientation: + scrollDirection: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 + m_Value: 0 + min: 0 + max: 360 scrollSpeed: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 + m_Value: 2 + min: 0 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -282,21 +284,31 @@ MonoBehaviour: 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 @@ -306,16 +318,3 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset index b608a514539..27be71b38aa 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset @@ -13,21 +13,13 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -59,9 +51,12 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -71,9 +66,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.18875 + min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.4402014, y: 0.45416793, z: 0.5} @@ -86,35 +83,34 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 21bb9ef0ab3fe414bacf326d4f1d8ee2, type: 3} - distortionMode: + enableDistortion: m_OverrideState: 0 m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollOrientation: + scrollDirection: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 + m_Value: 0 + min: 0 + max: 360 scrollSpeed: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 + m_Value: 2 + min: 0 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -130,21 +126,31 @@ MonoBehaviour: 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 @@ -154,16 +160,3 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset index 657ac1e21d7..9b074ca40ff 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset @@ -13,114 +13,84 @@ MonoBehaviour: m_Name: ScreenSpaceReflection m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 enabled: m_OverrideState: 1 m_Value: 1 - tracing: + rayTracing: m_OverrideState: 0 - m_Value: 1 - m_MinSmoothness: + m_Value: 0 + minSmoothness: m_OverrideState: 1 m_Value: 0 - m_SmoothnessFadeStart: + min: 0 + max: 1 + smoothnessFadeStart: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 - usedAlgorithm: - m_OverrideState: 0 - m_Value: 0 depthBufferThickness: m_OverrideState: 1 m_Value: 0.006 + min: 0 + max: 1 screenFadeDistance: m_OverrideState: 1 m_Value: 0 - accumulationFactor: - m_OverrideState: 0 - m_Value: 0.75 - m_RayMaxIterations: - m_OverrideState: 1 - m_Value: 128 - rayMiss: - m_OverrideState: 0 - m_Value: 3 - lastBounceFallbackHierarchy: - m_OverrideState: 0 - m_Value: 3 + min: 0 + max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 - textureLodBias: - m_OverrideState: 0 - m_Value: 1 - m_RayLength: + rayLength: m_OverrideState: 0 m_Value: 10 - m_ClampValue: + min: 0.001 + max: 50 + clampValue: m_OverrideState: 0 m_Value: 1 - m_Denoise: + min: 0.001 + max: 10 + denoise: m_OverrideState: 0 m_Value: 0 - m_DenoiserRadius: + denoiserRadius: m_OverrideState: 0 m_Value: 8 - m_AffectSmoothSurfaces: - m_OverrideState: 0 - m_Value: 0 + min: 1 + max: 32 mode: m_OverrideState: 0 m_Value: 2 - m_FullResolution: + upscaleRadius: + m_OverrideState: 0 + m_Value: 2 + fullResolution: m_OverrideState: 0 m_Value: 0 sampleCount: m_OverrideState: 0 m_Value: 1 + min: 1 + max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - m_RayMaxIterationsRT: - m_OverrideState: 0 - m_Value: 48 ---- !u!114 &-1508565263743468274 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: + min: 1 + max: 31 + m_RayMaxIterations: m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 + m_Value: 128 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -135,4 +105,3 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: -3706306561061678719} - - {fileID: -1508565263743468274} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset index d36197d7152..9710f0685db 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset @@ -13,21 +13,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 2 @@ -44,39 +36,50 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 0 + m_AdvancedMode: 0 colorMode: m_OverrideState: 1 m_Value: 1 color: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 density: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 1 maxFogDistance: m_OverrideState: 1 m_Value: 5000 + min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.5 + min: 0 + max: 1 mipFogNear: m_OverrideState: 1 m_Value: 0 + min: 0 mipFogFar: m_OverrideState: 1 m_Value: 1000 + min: 0 fogDistance: m_OverrideState: 1 m_Value: 200 + min: 0 fogBaseHeight: m_OverrideState: 1 m_Value: 0 fogHeightAttenuation: m_OverrideState: 1 m_Value: 0.2 + min: 0 + max: 1 --- !u!114 &-3990501575690934820 MonoBehaviour: m_ObjectHideFlags: 3 @@ -90,6 +93,7 @@ MonoBehaviour: m_Name: LiftGammaGain m_EditorClassIdentifier: active: 0 + m_AdvancedMode: 0 lift: m_OverrideState: 0 m_Value: {x: 1, y: 1, z: 1, w: 0} @@ -112,15 +116,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - directionalTransmissionMultiplier: - m_OverrideState: 0 - m_Value: 1 + min: 0 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -155,6 +160,10 @@ MonoBehaviour: m_Name: DepthOfField m_EditorClassIdentifier: active: 0 + m_AdvancedMode: 0 + useQualitySettings: + m_OverrideState: 0 + m_Value: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -164,42 +173,49 @@ MonoBehaviour: focusDistance: m_OverrideState: 1 m_Value: 10 - focusDistanceMode: - m_OverrideState: 0 - m_Value: 0 + min: 0.1 nearFocusStart: m_OverrideState: 1 m_Value: 0 + min: 0 nearFocusEnd: m_OverrideState: 1 m_Value: 4 + min: 0 farFocusStart: m_OverrideState: 1 m_Value: 10 + min: 0 farFocusEnd: m_OverrideState: 1 m_Value: 20 + min: 0 m_NearSampleCount: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 5 + min: 3 + max: 8 m_NearMaxBlur: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 4 + min: 0 + max: 8 m_FarSampleCount: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 7 + min: 3 + max: 16 m_FarMaxBlur: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 8 - m_Resolution: - m_OverrideState: 0 - m_Value: 2 + min: 0 + max: 16 m_HighQualityFiltering: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 - m_PhysicallyBased: - m_OverrideState: 0 - m_Value: 0 + m_Resolution: + m_OverrideState: 1 + m_Value: 2 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -235,9 +251,12 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 0 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -247,12 +266,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 5.2074246 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -262,87 +280,13 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 --- !u!114 &2523018487990756456 MonoBehaviour: m_ObjectHideFlags: 3 @@ -356,9 +300,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 0 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -368,12 +315,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -383,24 +329,37 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 + min: 0 + max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -417,39 +376,41 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 + useQualitySettings: + m_OverrideState: 0 + m_Value: 0 quality: m_OverrideState: 0 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 2.5 + min: 0 maximumVelocity: m_OverrideState: 0 m_Value: 200 + min: 0 + max: 1500 minimumVelocity: m_OverrideState: 0 m_Value: 2 - cameraMotionBlur: - m_OverrideState: 0 - m_Value: 1 - specialCameraClampMode: - m_OverrideState: 0 - m_Value: 0 - cameraVelocityClamp: - m_OverrideState: 0 - m_Value: 0.05 - cameraTranslationVelocityClamp: - m_OverrideState: 0 - m_Value: 0.05 + min: 0 + max: 64 cameraRotationVelocityClamp: m_OverrideState: 1 m_Value: 0.1 + min: 0 + max: 0.2 depthComparisonExtent: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 20 m_SampleCount: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 8 + min: 2 --- !u!114 &6271081758499213648 MonoBehaviour: m_ObjectHideFlags: 3 @@ -463,9 +424,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - quality: - m_OverrideState: 0 - m_Value: 1 + m_AdvancedMode: 0 enabled: m_OverrideState: 1 m_Value: 1 @@ -475,66 +434,52 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - tint: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 5000 + min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.5 + min: 0 + max: 1 mipFogNear: m_OverrideState: 1 m_Value: 0 + min: 0 mipFogFar: m_OverrideState: 1 m_Value: 1000 + min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 maximumHeight: m_OverrideState: 0 m_Value: 50 + albedo: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 200 + min: 1 enableVolumetricFog: m_OverrideState: 0 m_Value: 0 - albedo: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - globalLightProbeDimmer: - m_OverrideState: 0 - m_Value: 1 - depthExtent: - m_OverrideState: 0 - m_Value: 64 - denoisingMode: - m_OverrideState: 0 - m_Value: 2 anisotropy: m_OverrideState: 0 m_Value: 0 - sliceDistributionUniformity: - m_OverrideState: 0 - m_Value: 0.75 - m_FogControlMode: - m_OverrideState: 0 - m_Value: 0 - screenResolutionPercentage: - m_OverrideState: 0 - m_Value: 12.5 - volumeSliceCount: - m_OverrideState: 0 - m_Value: 64 - m_VolumetricFogBudget: - m_OverrideState: 0 - m_Value: 0.33 - m_ResolutionDepthRatio: - m_OverrideState: 0 - m_Value: 0.666 - directionalLightsOnly: + min: -1 + max: 1 + globalLightProbeDimmer: m_OverrideState: 0 - m_Value: 0 + m_Value: 1 + min: 0 + max: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset index bc6f1a69033..21eb0a5201f 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset @@ -13,39 +13,41 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 20 + min: 0 maximumVelocity: m_OverrideState: 1 m_Value: 200 + min: 0 + max: 1500 minimumVelocity: m_OverrideState: 1 m_Value: 2 - cameraMotionBlur: - m_OverrideState: 0 - m_Value: 1 - specialCameraClampMode: - m_OverrideState: 0 - m_Value: 0 - cameraVelocityClamp: - m_OverrideState: 0 - m_Value: 0.05 - cameraTranslationVelocityClamp: - m_OverrideState: 0 - m_Value: 0.05 + min: 0 + max: 64 cameraRotationVelocityClamp: m_OverrideState: 1 m_Value: 0.03 + min: 0 + max: 0.2 depthComparisonExtent: m_OverrideState: 1 m_Value: 1 - m_SampleCount: + min: 0 + max: 20 + cameraMotionBlur: m_OverrideState: 0 + m_Value: 1 + m_SampleCount: + m_OverrideState: 1 m_Value: 8 + min: 2 --- !u!114 &-3307415950195135037 MonoBehaviour: m_ObjectHideFlags: 3 @@ -59,21 +61,13 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -90,9 +84,12 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 289 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -102,9 +99,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.4222085 + min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -117,35 +116,34 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 5fb993a599e7e9b4b825e1a28e6d2c07, type: 3} - distortionMode: + enableDistortion: m_OverrideState: 0 m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollOrientation: - m_OverrideState: 1 - m_Value: - mode: 0 - customValue: 289 - additiveValue: 0 - multiplyValue: 0 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 scrollSpeed: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 + m_Value: 2 + min: 0 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -161,21 +159,31 @@ MonoBehaviour: 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 @@ -185,19 +193,6 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 2 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset index c0291b7b671..407ccee8257 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset @@ -20,14 +20,8 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -233,9 +227,6 @@ MonoBehaviour: focusDistance: m_OverrideState: 0 m_Value: 10 - focusDistanceMode: - m_OverrideState: 0 - m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 0.72 @@ -337,9 +328,6 @@ MonoBehaviour: focusDistance: m_OverrideState: 0 m_Value: 10 - focusDistanceMode: - m_OverrideState: 0 - m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 1.47 @@ -412,12 +400,6 @@ MonoBehaviour: skyAmbientMode: m_OverrideState: 0 m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset index 1d7d2de8219..248494ecfae 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset @@ -30,6 +30,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 0 @@ -37,14 +38,8 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 @@ -61,6 +56,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 1 quality: m_OverrideState: 0 m_Value: 1 @@ -73,21 +69,32 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 1, g: 0, b: 0, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 500 + min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.7 + min: 0 + max: 1 mipFogNear: m_OverrideState: 1 m_Value: 25 + min: 0 mipFogFar: m_OverrideState: 1 m_Value: 100 + min: 0 baseHeight: m_OverrideState: 1 m_Value: 500 @@ -97,42 +104,61 @@ MonoBehaviour: meanFreePath: m_OverrideState: 1 m_Value: 50 + min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 albedo: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 1 depthExtent: m_OverrideState: 1 m_Value: 25 + min: 0.1 denoisingMode: m_OverrideState: 1 m_Value: 0 anisotropy: m_OverrideState: 1 m_Value: 0 + min: -1 + max: 1 sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 + min: 0 + max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 1 m_Value: 25 + min: 6.25 + max: 100 volumeSliceCount: m_OverrideState: 1 m_Value: 128 + min: 1 + max: 1024 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 + min: 0 + max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 + min: 0 + max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -149,15 +175,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 + min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -192,9 +224,13 @@ MonoBehaviour: m_Name: VolumetricLightingController m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 depthExtent: m_OverrideState: 1 m_Value: 25 + min: 0.1 sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 + min: 0 + max: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset index e6d895399a6..ae25336a76b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 mode: m_OverrideState: 0 m_Value: 0 @@ -118,15 +119,19 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 + min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 + min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} + min: 0 + max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -151,6 +156,7 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 + min: 0 --- !u!114 &-6901118705532630215 MonoBehaviour: m_ObjectHideFlags: 3 @@ -164,33 +170,46 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 2 toeStrength: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 toeLength: m_OverrideState: 0 m_Value: 0.5 + min: 0 + max: 1 shoulderStrength: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 shoulderLength: m_OverrideState: 0 m_Value: 0.5 + min: 0 shoulderAngle: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 gamma: m_OverrideState: 0 m_Value: 1 + min: 0.001 lutTexture: m_OverrideState: 0 m_Value: {fileID: 0} lutContribution: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 --- !u!114 &-1982369472900735902 MonoBehaviour: m_ObjectHideFlags: 3 @@ -204,27 +223,37 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 2 threshold: m_OverrideState: 1 m_Value: 0 + min: 0 intensity: m_OverrideState: 1 m_Value: 0.15 + min: 0 + max: 1 scatter: m_OverrideState: 1 m_Value: 0.65 + min: 0 + max: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} dirtIntensity: m_OverrideState: 0 m_Value: 0 + min: 0 anamorphic: m_OverrideState: 0 m_Value: 1 @@ -250,9 +279,12 @@ MonoBehaviour: m_Name: CloudLayer m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 1 opacity: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 @@ -262,18 +294,20 @@ MonoBehaviour: resolution: m_OverrideState: 0 m_Value: 1024 - shadowMultiplier: + shadowOpacity: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 shadowTint: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} - shadowResolution: - m_OverrideState: 0 - m_Value: 256 - shadowSize: - m_OverrideState: 0 - m_Value: 500 + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + shadowsResolution: + m_OverrideState: 1 + m_Value: 512 layerA: cloudMap: m_OverrideState: 1 @@ -281,41 +315,49 @@ MonoBehaviour: opacityR: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 opacityG: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 opacityB: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 opacityA: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 rotation: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 360 tint: m_OverrideState: 1 m_Value: {r: 0.8396226, g: 0.66069466, b: 0.5029815, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 exposure: m_OverrideState: 1 m_Value: 0 distortionMode: m_OverrideState: 0 m_Value: 0 - scrollOrientation: + scrollDirection: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 + m_Value: 0 + min: 0 + max: 360 scrollSpeed: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 + m_Value: 1 + min: 0 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -325,9 +367,13 @@ MonoBehaviour: steps: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 thickness: m_OverrideState: 1 m_Value: 0.36 + min: 0 + max: 1 castShadows: m_OverrideState: 1 m_Value: 1 @@ -338,41 +384,49 @@ MonoBehaviour: opacityR: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 1 opacityG: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 opacityB: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 1 opacityA: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 1 rotation: m_OverrideState: 0 m_Value: 0 + min: 0 + max: 360 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 exposure: m_OverrideState: 1 m_Value: -3.5 distortionMode: m_OverrideState: 0 m_Value: 0 - scrollOrientation: + scrollDirection: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 + m_Value: 0 + min: 0 + max: 360 scrollSpeed: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 + m_Value: 1 + min: 0 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -382,9 +436,13 @@ MonoBehaviour: steps: m_OverrideState: 0 m_Value: 4 + min: 1 + max: 10 thickness: m_OverrideState: 0 m_Value: 0.5 + min: 0 + max: 1 castShadows: m_OverrideState: 0 m_Value: 0 @@ -419,6 +477,7 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 @@ -426,14 +485,8 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 1 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 + m_Value: 1 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset index c7c00db08d3..9c9f5fddac2 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 @@ -20,14 +21,8 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -44,6 +39,7 @@ MonoBehaviour: m_Name: Fog m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -56,21 +52,32 @@ MonoBehaviour: color: m_OverrideState: 0 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 maxFogDistance: m_OverrideState: 0 m_Value: 5000 + min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 + min: 0 + max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 + min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 + min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 @@ -80,42 +87,61 @@ MonoBehaviour: meanFreePath: m_OverrideState: 0 m_Value: 400 + min: 1 enableVolumetricFog: m_OverrideState: 0 m_Value: 0 albedo: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 + min: 0.1 denoisingMode: m_OverrideState: 0 m_Value: 2 anisotropy: m_OverrideState: 0 m_Value: 0 + min: -1 + max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 + min: 0 + max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 0 m_Value: 12.5 + min: 6.25 + max: 50 volumeSliceCount: m_OverrideState: 0 m_Value: 64 + min: 1 + max: 512 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 + min: 0 + max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 + min: 0 + max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -149,9 +175,12 @@ MonoBehaviour: m_Name: PhysicallyBasedSky 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 @@ -161,9 +190,11 @@ MonoBehaviour: 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} @@ -176,6 +207,7 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 @@ -191,42 +223,66 @@ MonoBehaviour: planetaryRadius: m_OverrideState: 0 m_Value: 6378100 + min: 0 planetCenterPosition: m_OverrideState: 0 m_Value: {x: 0, y: -6378100, z: 0} airDensityR: m_OverrideState: 0 m_Value: 0.04534 + min: 0 + max: 1 airDensityG: m_OverrideState: 0 m_Value: 0.10237241 + min: 0 + max: 1 airDensityB: m_OverrideState: 0 m_Value: 0.23264056 + min: 0 + max: 1 airTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 airMaximumAltitude: m_OverrideState: 0 m_Value: 55261.973 + min: 0 aerosolDensity: m_OverrideState: 0 m_Value: 0.01192826 + min: 0 + max: 1 aerosolTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 0.9, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 aerosolMaximumAltitude: m_OverrideState: 0 m_Value: 8289.296 + min: 0 aerosolAnisotropy: m_OverrideState: 0 m_Value: 0 + min: -1 + max: 1 numberOfBounces: m_OverrideState: 0 m_Value: 8 + min: 1 + max: 10 groundTint: m_OverrideState: 1 m_Value: {r: 0.31621575, g: 0.3454625, b: 0.3584906, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 0 groundColorTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -236,6 +292,7 @@ MonoBehaviour: groundEmissionMultiplier: m_OverrideState: 0 m_Value: 1 + min: 0 planetRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -245,27 +302,42 @@ MonoBehaviour: spaceEmissionMultiplier: m_OverrideState: 0 m_Value: 1 + min: 0 spaceRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} colorSaturation: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 alphaSaturation: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 alphaMultiplier: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 horizonTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 0 zenithTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 0 horizonZenithShift: m_OverrideState: 0 m_Value: 0 + min: -1 + max: 1 m_SkyVersion: 1 m_ObsoleteEarthPreset: m_OverrideState: 0 @@ -283,6 +355,7 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -388,15 +461,19 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 + min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 + min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} + min: 0 + max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -421,3 +498,4 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 + min: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset index baadbcb6211..766eb60a56b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset @@ -29,6 +29,7 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 2 @@ -38,62 +39,80 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 4 directLightingStrength: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 1 radius: m_OverrideState: 1 m_Value: 1 + min: 0.25 + max: 5 spatialBilateralAggressiveness: m_OverrideState: 0 m_Value: 0.15 + min: 0 + max: 1 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 + min: 0 + max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 + min: 0 + max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 - occluderMotionRejection: - m_OverrideState: 0 - m_Value: 1 - receiverMotionRejection: - m_OverrideState: 0 - m_Value: 1 m_StepCount: - m_OverrideState: 1 - m_Value: 16 + m_OverrideState: 0 + m_Value: 6 + min: 2 + max: 32 m_FullResolution: - m_OverrideState: 1 - m_Value: 1 + m_OverrideState: 0 + m_Value: 0 m_MaximumRadiusInPixels: - m_OverrideState: 1 - m_Value: 80 + m_OverrideState: 0 + m_Value: 40 + min: 16 + max: 256 m_BilateralUpsample: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 1 m_DirectionCount: - m_OverrideState: 1 - m_Value: 4 + m_OverrideState: 0 + m_Value: 2 + min: 1 + max: 6 m_RayLength: - m_OverrideState: 1 - m_Value: 20 + m_OverrideState: 0 + m_Value: 0.5 + min: 0 + max: 50 m_SampleCount: - m_OverrideState: 1 - m_Value: 8 + m_OverrideState: 0 + m_Value: 1 + min: 1 + max: 64 m_Denoise: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 1 m_DenoiserRadius: - m_OverrideState: 1 - m_Value: 0.65 + m_OverrideState: 0 + m_Value: 1 + min: 0.001 + max: 1 --- !u!114 &5586737667120579711 MonoBehaviour: m_ObjectHideFlags: 3 @@ -107,21 +126,13 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -138,9 +149,12 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -150,9 +164,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 5.20731 + min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.4714623, y: 0.4714616, z: 0.5} @@ -165,35 +181,34 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} - distortionMode: + enableDistortion: m_OverrideState: 0 m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollOrientation: + scrollDirection: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 + m_Value: 0 + min: 0 + max: 360 scrollSpeed: m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 + m_Value: 2 + min: 0 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -209,21 +224,31 @@ MonoBehaviour: 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 @@ -233,16 +258,3 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset index b15653f0ac6..5ecdae9653e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset @@ -12,36 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: Scene Settings Profile m_EditorClassIdentifier: - components: - - {fileID: 525883688551753881} ---- !u!114 &525883688551753881 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 + components: [] diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset index 8eee8ea84c1..5ecdae9653e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset @@ -12,36 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: Scene Settings Profile m_EditorClassIdentifier: - components: - - {fileID: 2568591178948852223} ---- !u!114 &2568591178948852223 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 + components: [] diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset index af61475a199..f19f670668c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -60,97 +61,17 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - limitMinCurveMap: - m_OverrideState: 0 - m_Value: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: -10 - value: -12 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 20 - value: 18 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - limitMaxCurveMap: - m_OverrideState: 0 - m_Value: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: -10 - value: -8 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 20 - value: 22 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 adaptationMode: m_OverrideState: 1 m_Value: 1 adaptationSpeedDarkToLight: m_OverrideState: 1 m_Value: 3 + min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 1 m_Value: 1 - weightTextureMask: - m_OverrideState: 0 - m_Value: {fileID: 0} - histogramPercentages: - m_OverrideState: 0 - m_Value: {x: 40, y: 90} - histogramUseCurveRemapping: - m_OverrideState: 0 - m_Value: 0 - targetMidGray: - m_OverrideState: 0 - m_Value: 0 - centerAroundExposureTarget: - m_OverrideState: 0 - m_Value: 0 - proceduralCenter: - m_OverrideState: 0 - m_Value: {x: 0.5, y: 0.5} - proceduralRadii: - m_OverrideState: 0 - m_Value: {x: 0.3, y: 0.3} - maskMinIntensity: - m_OverrideState: 0 - m_Value: -30 - maskMaxIntensity: - m_OverrideState: 0 - m_Value: 30 - proceduralSoftness: - m_OverrideState: 0 - m_Value: 0.5 + min: 0.001 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -165,35 +86,3 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: -6322084644017855310} - - {fileID: 1052189620847248129} ---- !u!114 &1052189620847248129 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} - m_Name: VisualEnvironment - m_EditorClassIdentifier: - active: 1 - skyType: - m_OverrideState: 0 - m_Value: 0 - cloudType: - m_OverrideState: 0 - m_Value: 0 - skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: - m_OverrideState: 0 - m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 - fogType: - m_OverrideState: 0 - m_Value: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab index 1ca0b685b78..3a8d6f51094 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab @@ -26,7 +26,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5870183540159428618} - {fileID: 5870183540305807088} @@ -65,7 +64,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 0 @@ -150,12 +148,10 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 - m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -170,14 +166,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 exposureTarget: {fileID: 0} - materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 72204296650588 @@ -191,14 +180,13 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 0 defaultFrameSettings: 0 - m_Version: 8 + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -273,7 +261,6 @@ Transform: m_LocalRotation: {x: 0.31429538, y: 0.3457062, z: -0.124121174, w: 0.8753854} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 1 @@ -435,7 +422,6 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -451,6 +437,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -490,7 +477,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 4 @@ -507,7 +493,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -526,8 +512,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 0dac2c76303e9a74e87ebaaea403fadc, type: 2} m_StaticLightingSkyUniqueID: 0 - m_StaticLightingCloudsUniqueID: 0 - m_StaticLightingVolumetricClouds: 0 --- !u!1 &5870183541445562935 GameObject: m_ObjectHideFlags: 0 @@ -556,7 +540,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 3 @@ -718,7 +701,6 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -734,6 +716,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -773,7 +756,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 2 @@ -817,7 +799,6 @@ VisualEffect: m_Array: [] --- !u!73398921 &5870183541744189769 VFXRenderer: - serializedVersion: 1 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -835,6 +816,15 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity index 429267bc182..ffd1ba377a6 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity @@ -191,11 +191,6 @@ PrefabInstance: propertyPath: m_Name value: HDRP objectReference: {fileID: 0} - - target: {fileID: 5870183540159428619, guid: 0ecfb9aa1bc41c049aab025283598019, - type: 3} - propertyPath: m_Version - value: 8 - objectReference: {fileID: 0} - target: {fileID: 5870183541744189769, guid: 0ecfb9aa1bc41c049aab025283598019, type: 3} propertyPath: m_Materials.Array.data[0] diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset index 4b454e5a79d..48ab8fcdf1f 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset @@ -30,9 +30,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 + min: 0 + max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -42,9 +45,11 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 + min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -57,24 +62,37 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 + min: 0 + max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 + min: 1 + max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -91,21 +109,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 2 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 @@ -122,15 +132,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 + min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 + min: 0 + max: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -165,9 +181,7 @@ MonoBehaviour: m_Name: Fog m_EditorClassIdentifier: active: 1 - quality: - m_OverrideState: 0 - m_Value: 1 + m_AdvancedMode: 0 enabled: m_OverrideState: 1 m_Value: 1 @@ -177,66 +191,70 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 300 + min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 + min: 0 + max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 + min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 + min: 0 baseHeight: m_OverrideState: 1 m_Value: 1 maximumHeight: m_OverrideState: 1 m_Value: 20 + albedo: + m_OverrideState: 1 + m_Value: {r: 1, g: 0.8970642, b: 0, a: 1} + hdr: 0 + showAlpha: 1 + showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 2.5 + min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 - albedo: + anisotropy: m_OverrideState: 1 - m_Value: {r: 1, g: 0.8970642, b: 0, a: 1} + m_Value: 0.5 + min: -1 + max: 1 globalLightProbeDimmer: m_OverrideState: 1 m_Value: 1 + min: 0 + max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - denoisingMode: - m_OverrideState: 0 - m_Value: 2 - anisotropy: - m_OverrideState: 1 - m_Value: 0.5 + min: 0.1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - m_FogControlMode: - m_OverrideState: 0 - m_Value: 0 - screenResolutionPercentage: - m_OverrideState: 0 - m_Value: 12.5 - volumeSliceCount: - m_OverrideState: 0 - m_Value: 64 - m_VolumetricFogBudget: - m_OverrideState: 0 - m_Value: 0.33 - m_ResolutionDepthRatio: - m_OverrideState: 0 - m_Value: 0.666 - directionalLightsOnly: + min: 0 + max: 1 + filter: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity index 5c9ebe6c49c..b9eae9a9b30 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity @@ -167,7 +167,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -216,7 +215,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.155, y: 5.969, z: 24.196} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -302,7 +300,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -15.42, y: 5.24, z: 15.99} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -319,6 +316,53 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 7 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 clearColorMode: 0 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -336,12 +380,10 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 - m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -356,14 +398,6 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 17521319083853 @@ -377,60 +411,12 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 - msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 0 defaultFrameSettings: 0 - m_Version: 8 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 --- !u!114 &270514561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -481,17 +467,11 @@ MonoBehaviour: TargetWidth: 512 TargetHeight: 512 PerPixelCorrectnessThreshold: 0 - PerPixelGammaThreshold: 0.003921569 - PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.001 - IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 ImageResolution: 0 - ActiveImageTests: 1 - ActivePixelTests: 7 captureFrameRate: 20 - fixedTimeStepScale: 1 simulateTime: 5.95 xrCompatible: 1 --- !u!4 &299252011 @@ -504,7 +484,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -541,8 +520,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: c0b22c5d4a882d04997474b651f04a14, type: 2} m_StaticLightingSkyUniqueID: 0 - m_StaticLightingCloudsUniqueID: 0 - m_StaticLightingVolumetricClouds: 0 --- !u!114 &493913624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -555,7 +532,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -570,7 +547,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -619,7 +595,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -668,7 +643,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.77, y: 1.59, z: 35.26} m_LocalScale: {x: 5, y: 5, z: 5} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -744,14 +718,12 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 24} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!73398921 &674445798 VFXRenderer: - serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -761,7 +733,6 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -769,6 +740,19 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -832,7 +816,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -881,7 +864,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.32, y: 3.14, z: 28.52} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -906,7 +888,6 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1382437304 VFXRenderer: - serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -916,7 +897,6 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -924,6 +904,19 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -997,7 +990,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 27} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -1045,7 +1037,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1094,7 +1085,6 @@ Transform: m_LocalRotation: {x: -0.20829226, y: 0.32973933, z: 0.07485625, w: 0.9177597} m_LocalPosition: {x: -14.19, y: 5.72, z: 26.04} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1119,7 +1109,6 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1486284230 VFXRenderer: - serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1129,7 +1118,6 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1137,6 +1125,19 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1210,7 +1211,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 30} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -1235,7 +1235,6 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1527903407 VFXRenderer: - serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1245,7 +1244,6 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1253,6 +1251,19 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1326,7 +1337,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 33} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -1421,7 +1431,6 @@ Transform: m_LocalRotation: {x: 0.29175767, y: -0.050442208, z: 0.12781513, w: 0.9465708} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1438,16 +1447,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + 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.141593 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1462,9 +1477,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1514,14 +1526,9 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -1537,17 +1544,10 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 + showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 --- !u!1 &2067038241 GameObject: m_ObjectHideFlags: 0 @@ -1591,7 +1591,6 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1640,7 +1639,6 @@ Transform: m_LocalRotation: {x: -0.20829226, y: 0.32973933, z: 0.07485625, w: 0.9177597} m_LocalPosition: {x: -18.95, y: 4.17, z: 26.04} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset index 9da6c7ed2b3..104ccf34a4c 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset @@ -83,15 +83,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - directionalTransmissionMultiplier: - m_OverrideState: 0 - m_Value: 1 + min: 0 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 + min: 1 + max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -126,21 +127,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 3 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 1 @@ -157,9 +150,12 @@ MonoBehaviour: m_Name: GradientSky 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 @@ -169,12 +165,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 1 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -184,18 +179,28 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 top: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 middle: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 bottom: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 gradientDiffusion: m_OverrideState: 0 m_Value: 1 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity index ae6caad07e6..e132c6795f2 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity @@ -118,8 +118,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -153,16 +151,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 6000 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -177,9 +181,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -196,9 +197,7 @@ 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 @@ -229,14 +228,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -252,17 +245,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &196708717 Light: m_ObjectHideFlags: 0 @@ -322,7 +305,6 @@ 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 &196708718 @@ -335,7 +317,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.0313, y: 0.6618, z: 0.0736} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -371,72 +352,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - clearColorMode: 1 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 - m_Version: 8 + m_Version: 7 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -483,6 +399,51 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + clearColorMode: 1 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 --- !u!81 &762437740 AudioListener: m_ObjectHideFlags: 0 @@ -544,7 +505,6 @@ Transform: m_LocalRotation: {x: 0.003963616, y: 0.9929508, z: -0.035168, w: 0.11312072} m_LocalPosition: {x: -0.43010604, y: 0.22291613, z: 2.0188065} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -579,16 +539,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 0 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -603,9 +569,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -622,9 +585,7 @@ 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 @@ -655,14 +616,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -678,17 +633,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &774493051 Light: m_ObjectHideFlags: 0 @@ -748,7 +693,6 @@ 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 &774493052 @@ -761,7 +705,6 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.99999994} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -786,7 +729,6 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1001802347 VFXRenderer: - serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -796,7 +738,6 @@ VFXRenderer: m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -804,6 +745,8 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 + m_Materials: + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -837,7 +780,6 @@ VisualEffect: m_InitialEventNameOverriden: 0 m_StartSeed: 0 m_ResetSeedOnPlay: 0 - m_ResourceVersion: 1 m_PropertySheet: m_Float: m_Array: [] @@ -871,7 +813,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.076, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -905,7 +846,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -920,7 +861,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9172678, y: -0.07954121, z: 5.81527} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -954,7 +894,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - m_IsGlobal: 1 + isGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -969,7 +909,6 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9119453, y: 10.3260975, z: 2.7467709} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1004,16 +943,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: + m_Version: 9 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 m_Intensity: 60000 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 - m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 - m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1028,9 +973,6 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} - m_IESPoint: {fileID: 0} - m_IESSpot: {fileID: 0} - m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1047,9 +989,7 @@ 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 @@ -1080,14 +1020,8 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 - m_AlwaysDrawDynamicShadows: 0 - m_UpdateShadowOnLightMovement: 0 - m_CachedShadowTranslationThreshold: 0.01 - m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 - m_preserveCachedShadow: 0 - m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1103,17 +1037,7 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - m_AreaLightEmissiveMeshShadowCastingMode: 0 - m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 - m_AreaLightEmissiveMeshLayer: -1 - m_Version: 11 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 + showAdditionalSettings: 0 --- !u!108 &1853046272 Light: m_ObjectHideFlags: 0 @@ -1173,7 +1097,6 @@ 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 &1853046273 @@ -1186,7 +1109,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0555, y: 0.6618, z: 0.1548} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset index ab7511dfbb4..495be543386 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -25,12 +28,11 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 + min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.46608552 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} + min: 0 desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -40,87 +42,13 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 + min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} - distortionMode: - m_OverrideState: 0 - m_Value: 0 - flowmap: - m_OverrideState: 0 - m_Value: {fileID: 0} - upperHemisphereOnly: - m_OverrideState: 0 - m_Value: 1 - scrollOrientation: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 0 - additiveValue: 0 - multiplyValue: 1 - scrollSpeed: - m_OverrideState: 0 - m_Value: - mode: 1 - customValue: 100 - additiveValue: 0 - multiplyValue: 1 - 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 - plateRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexRotation: - m_OverrideState: 0 - m_Value: 0 - plateTexOffset: - m_OverrideState: 0 - m_Value: {x: 0, y: 0} - blendAmount: - m_OverrideState: 0 - m_Value: 0 - shadowTint: - m_OverrideState: 0 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - pointLightShadow: - m_OverrideState: 0 - m_Value: 0 - dirLightShadow: - m_OverrideState: 0 - m_Value: 0 - rectLightShadow: - m_OverrideState: 0 - m_Value: 0 - m_SkyVersion: 1 - enableDistortion: - m_OverrideState: 0 - m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - m_ObsoleteScrollSpeed: - m_OverrideState: 0 - m_Value: 1 --- !u!114 &-60721801795345313 MonoBehaviour: m_ObjectHideFlags: 3 @@ -134,21 +62,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 + m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 - cloudType: - m_OverrideState: 0 - m_Value: 0 skyAmbientMode: - m_OverrideState: 1 - m_Value: 0 - windOrientation: m_OverrideState: 0 m_Value: 0 - windSpeed: - m_OverrideState: 0 - m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs index 06b4e581719..a3b74156caf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs @@ -17,7 +17,7 @@ public sealed class VisualEnvironment : VolumeComponent /// Type of clouds that should be used for rendering. public NoInterpIntParameter cloudType = new NoInterpIntParameter(0); /// Defines the way the ambient probe should be computed. - public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Dynamic); + public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Static); /// Controls the global orientation of the wind relative to the X world vector. [Header("Wind")] From 428aa3a75f8269f6324d5ff88bae21f9f76bbef5 Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Thu, 2 Sep 2021 17:13:46 +0200 Subject: [PATCH 023/149] Revert "Revert "Changed Ambient Mode to Dynamic by default (#5465)"" This reverts commit 492837420ad616ed40f874048730038acef4849e. --- .../Scene Settings Profile.asset | 95 +- .../1214_Lit_LowResTransparent.unity | 22 +- .../1x_Materials/1225_Lit_SpeedTree8SG.unity | 20 +- .../Scene Settings Profile.asset | 168 +- .../Scenes/1x_Materials/1301_StackLitSG.unity | 16 +- .../Scene Settings Profile.asset | 131 +- .../1x_Materials/1602_TerrainLit_Normal.unity | 18 +- .../1x_Materials/1801_MaterialQuality.unity | 781 ++-- .../Global Volume Profile.asset | 47 + .../Global Volume Profile.asset.meta | 8 + .../1900_AlphaTest_SG/HDRP_Volume.asset | 68 +- .../1x_Materials/1900_AlphaTest_SG_a.unity | 470 +-- .../HDRP_Default_Sky 1.asset | 134 +- .../2009_MultipleSkies/Sky_Static.asset | 94 +- .../Sky and Fog Settings Profile 1.asset | 2 +- .../2204_ReflectionProbes_Lights.unity | 3602 ++++++++++------- .../Scene Settings Profile.asset | 47 + .../Scene Settings Profile.asset.meta | 8 + .../2206_PlanarReflectionVFace.meta | 8 + .../2206_PlanarReflectionVFace.unity | 571 ++- .../Global Volume Profile.asset | 47 + .../Global Volume Profile.asset.meta | 8 + .../Scene Settings Profile.asset | 65 +- .../2207_ReflectionProbeVFace.meta | 8 + .../2207_ReflectionProbeVFace.unity | 575 ++- .../Global Volume Profile.asset | 47 + .../Global Volume Profile.asset.meta | 8 + .../Scene Settings Profile.asset | 38 +- .../Global Volume Profile.asset | 67 +- .../Global Volume Profile.asset | 61 +- .../Global Volume Profile.asset | 97 +- .../Scene Settings Profile.asset | 267 +- .../MotionBlurProfile.asset | 91 +- .../GlobalVolume Profile.asset | 18 + .../5001_Fog_FogFallback/Volume_Base.asset | 48 +- .../Scene Settings Profile.asset | 125 +- .../5011_VolumetricClouds/GlobalVolume.asset | 90 +- .../Global Volume Profile.asset | 124 +- .../Scene Settings Profile.asset | 34 +- .../Scene Settings Profile.asset | 34 +- .../Scene Settings Profile.asset | 117 +- .../VFXTests/GraphicsTests/HDRP.prefab | 36 +- .../VFXTests/GraphicsTests/HDRP.unity | 5 + .../HDRPFogVolumetric Settings Profile.asset | 90 +- .../GraphicsTests/HDRPFogVolumetric.unity | 220 +- .../GraphicsTests/HDRP_SceneSetting.asset | 35 +- .../GraphicsTests/ParticleRibbonLit.unity | 232 +- .../ParticleRibbonLitVolumeProfile.asset | 94 +- .../Runtime/Sky/VisualEnvironment.cs | 2 +- 49 files changed, 5690 insertions(+), 3303 deletions(-) create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset index 1cd72badfb8..9b4a1746c0c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset @@ -31,6 +31,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -50,8 +62,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -61,11 +71,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 2.2355762 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -75,10 +86,84 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 9c13f7d97fda704439868458dc2385ed, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity index 2dc6343507f..0daf509640b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity @@ -153,6 +153,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.02, y: -0.94, z: -0.01785475} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 3 @@ -312,7 +313,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -587,6 +588,7 @@ Transform: m_LocalRotation: {x: 0.12893414, y: -0, z: -0, w: 0.99165314} m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 150555374} - {fileID: 1560707990} @@ -622,6 +624,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.05, y: 1.76, z: -0.02} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 2 @@ -821,6 +824,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -836,7 +840,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -920,6 +923,7 @@ Transform: m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -1016,6 +1020,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: -3.2892313, z: -0.3983413} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1112,6 +1117,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: -3.2892313, z: -0.3983413} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1208,6 +1214,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: 1.6230732, z: -1.7315147} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1241,6 +1248,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -10.02, y: -3.01, z: -0.02} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 4 @@ -1419,6 +1427,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: -0.7896553, z: -1.0767106} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -1515,6 +1524,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -10.628, y: -0.7896553, z: -1.0767106} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1548,6 +1558,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.68, y: 2.941782, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 1 @@ -1726,6 +1737,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: -14.967999, y: 1.6230732, z: -1.7315147} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1759,6 +1771,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.818, y: 2.941782, z: 0} m_LocalScale: {x: 3, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560707990} m_RootOrder: 0 @@ -1871,6 +1884,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.23, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1517719156} - {fileID: 1270125020} @@ -1973,6 +1987,7 @@ Transform: m_LocalRotation: {x: -0.73307997, y: -0, z: -0, w: 0.6801425} m_LocalPosition: {x: -12.526949, y: -0.15709, z: 4.54} m_LocalScale: {x: 2.1692, y: 1, z: 2.3152} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -2022,7 +2037,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -2037,6 +2052,7 @@ Transform: m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341} m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity index 09d39e319bc..23a0110f8b9 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1225_Lit_SpeedTree8SG.unity @@ -336,6 +336,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.69, y: 0.5, z: -1.441} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -366,6 +367,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 0.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1127870805} m_Father: {fileID: 1935598840} @@ -470,6 +472,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -506,6 +509,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 1.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1636819555} m_Father: {fileID: 1935598840} @@ -537,6 +541,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 0.95154047, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 421122601} m_Father: {fileID: 1025210030} @@ -820,6 +825,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.9515405, y: -3.2690406, z: -4.989624} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1189675139} - {fileID: 1841570170} @@ -949,6 +955,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 2.9515405, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1369615379} m_Father: {fileID: 1025210030} @@ -980,6 +987,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: -0.7708664, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1880594515} m_Father: {fileID: 1935598840} @@ -1030,7 +1038,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -1045,6 +1053,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -1087,6 +1096,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: -0.04845953, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 426221817} m_Father: {fileID: 1025210030} @@ -1133,6 +1143,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1209,7 +1220,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -1518,6 +1529,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 1.9515405, y: 3.2690406, z: 3.489624} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1398137499} m_Father: {fileID: 1025210030} @@ -1654,6 +1666,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.2291336, y: 0.93398416, z: -0.60040474} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2110808628} - {fileID: 568011718} @@ -1752,6 +1765,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0.395, y: 4.331, z: -3.78} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -2090,6 +2104,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.694, y: 0.5, z: 0.55} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -2120,6 +2135,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.000000014901159, w: 1} m_LocalPosition: {x: 2.2291336, y: -0.93398416, z: 1.0907807} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1683058730} m_Father: {fileID: 1935598840} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset index b509429d276..6de27ca1bce 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLit/Scene Settings Profile.asset @@ -4,7 +4,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -20,7 +21,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -31,30 +33,117 @@ MonoBehaviour: 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 + 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: 1 m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &114392438171864176 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -65,48 +154,39 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 - min: 0 - max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 - min: 0 - max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 - min: 0 --- !u!114 &114499654985824276 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -117,49 +197,48 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 exposure: m_OverrideState: 1 m_Value: 0 multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 updateMode: m_OverrideState: 1 m_Value: 0 updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -167,7 +246,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -178,6 +258,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity index a47da77d5f7..da6377ef28e 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity @@ -301,6 +301,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -415,6 +416,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.9515405, y: -3.2690406, z: -4.989624} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2108988498} - {fileID: 1703845552} @@ -723,7 +725,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -738,6 +740,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -803,6 +806,11 @@ PrefabInstance: propertyPath: field of view value: 45 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &1703845551 @@ -979,6 +987,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0.395, y: 4.331, z: -3.78} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1078,6 +1087,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -1093,7 +1103,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -1218,6 +1227,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1233,7 +1243,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -1317,6 +1326,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset index f5735f97a8a..f939eda6ecf 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1352_Fabric_Env/Scene Settings Profile.asset @@ -33,43 +33,33 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 - min: 0 - max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 - min: 0 - max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 - min: 0 --- !u!114 &114374333047554170 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86,8 +76,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -97,11 +85,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -111,37 +100,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -161,8 +137,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -172,11 +146,12 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.0145614 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -186,13 +161,87 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &114883432347898006 MonoBehaviour: m_ObjectHideFlags: 0 @@ -209,6 +258,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity index e9e52f241ba..ac4ed96683a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1602_TerrainLit_Normal.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.047137707, g: 0.06653553, b: 0.105606586, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -238,6 +238,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -253,7 +254,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -337,6 +337,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 8.476068, y: -5.7846136, z: 9.519677} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -414,6 +415,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -463,7 +465,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -478,6 +480,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -510,6 +513,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.9, y: 0, z: 14.26} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1526466806} m_RootOrder: 0 @@ -638,6 +642,11 @@ PrefabInstance: propertyPath: field of view value: 40 objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: clearColorMode @@ -748,6 +757,7 @@ Transform: m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: -10, y: 0, z: 10} m_LocalScale: {x: 2, y: 1, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -778,6 +788,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 598431484} - {fileID: 1869420999} @@ -812,6 +823,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -1.87, y: 0, z: 14.26} m_LocalScale: {x: 1, y: 1.0000005, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1526466806} m_RootOrder: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity index f0345dd7dc8..c395c6ddbef 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality.unity @@ -24,7 +24,7 @@ RenderSettings: m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 4 + m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,7 +153,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 513 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -198,51 +265,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 513 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!20 &42229485 Camera: m_ObjectHideFlags: 0 @@ -296,6 +318,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -9.561, y: 3.34, z: 1.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1177063882} m_Father: {fileID: 0} @@ -344,10 +367,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -391,6 +416,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.699999, y: 3.27, z: 9.58} m_LocalScale: {x: 1.6464, y: 1.6464, z: 1.6464} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -402,11 +428,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1502620697} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 1 - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -417,6 +438,31 @@ PrefabInstance: Reflection on low' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01953125 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -432,6 +478,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -447,16 +498,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -472,21 +513,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 0.01953125 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -511,6 +537,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: 104.8 @@ -523,6 +553,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -10 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -535,14 +569,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -568,7 +594,7 @@ PrefabInstance: - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_Version - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -577,30 +603,30 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: ImageComparisonSettings.TargetWidth - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: ImageComparisonSettings.TargetHeight - value: 512 + propertyPath: xrLayout + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: waitFrames value: 1 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: xrLayout - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipelineAsset value: objectReference: {fileID: 11400000, guid: a1e896277e7aec54dab400844753769a, type: 2} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetWidth + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: ImageComparisonSettings.TargetHeight + value: 512 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &345783686 stripped @@ -609,6 +635,55 @@ Transform: type: 3} m_PrefabInstance: {fileID: 345783685} m_PrefabAsset: {fileID: 0} +--- !u!1 &788298197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788298199} + - component: {fileID: 788298198} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &788298198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788298197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: e933dcbd683c300418703544e87bd63e, type: 2} +--- !u!4 &788298199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788298197} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -133.65039, y: -9.035299, z: 33.127846} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1177063881 PrefabInstance: m_ObjectHideFlags: 0 @@ -616,11 +691,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 42229486} m_Modifications: - - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_CharacterSize - value: 1 - objectReference: {fileID: 0} - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Text @@ -628,6 +698,31 @@ PrefabInstance: Reflection on low' objectReference: {fileID: 0} + - target: {fileID: 198941061589059314, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_CharacterSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01953125 + objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.01953125 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalPosition.x @@ -643,6 +738,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -8.99 objectReference: {fileID: 0} + - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalRotation.x @@ -658,16 +758,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -683,21 +773,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.x - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.y - value: 0.01953125 - objectReference: {fileID: 0} - - target: {fileID: 5489785850083597078, guid: 7340be8cd4dd8d34d808e2c6090d869f, - type: 3} - propertyPath: m_LocalScale.z - value: 0.01953125 - objectReference: {fileID: 0} - target: {fileID: 6004892619064504655, guid: 7340be8cd4dd8d34d808e2c6090d869f, type: 3} propertyPath: m_Name @@ -741,53 +816,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 0 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -800,15 +828,23 @@ MonoBehaviour: dithering: 1 stopNaNs: 0 taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -817,6 +853,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005811052381 @@ -827,12 +871,63 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 2 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 4 defaultFrameSettings: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!20 &1502620696 Camera: m_ObjectHideFlags: 0 @@ -886,6 +981,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -9.561, y: 3.34, z: 1.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 292073641} m_Father: {fileID: 0} @@ -923,101 +1019,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 0 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1034,6 +1035,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 19.89, y: 0.01, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1046,30 +1058,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 19.89, y: 0.01, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 3 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: -0.70710677, y: 0, z: 0, w: 0.70710677} + resolutionScalable: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 1 renderingPathCustomFrameSettings: @@ -1082,6 +1088,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 1 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1099,8 +1109,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1177,6 +1187,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1220,6 +1232,9 @@ MonoBehaviour: e32: 0 e33: 0 m_CapturePosition: {x: 0, y: 0, z: 0} + m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} + m_FieldOfView: 0 + m_Aspect: 0 m_CustomRenderData: m_WorldToCameraRHS: e00: 0 @@ -1256,13 +1271,139 @@ MonoBehaviour: e32: 0 e33: 0 m_CapturePosition: {x: 0, y: 0, z: 0} - m_EditorOnlyData: 0 - m_PlanarProbeVersion: 6 + m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} + m_FieldOfView: 0 + m_Aspect: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 3 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 0 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} + m_PlanarProbeVersion: 7 m_ObsoleteCaptureNearPlane: 0.3 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} --- !u!23 &1553371902 MeshRenderer: m_ObjectHideFlags: 0 @@ -1274,10 +1415,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1313,7 +1456,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} @@ -1335,6 +1478,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.7, y: 1.55, z: 9.27} m_LocalScale: {x: 1.9826, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1370,8 +1514,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 0} m_StaticLightingSkyUniqueID: 0 - m_SkySettings: {fileID: 0} - m_SkySettingsFromProfile: {fileID: 0} + m_StaticLightingCloudsUniqueID: 0 --- !u!4 &1608707855 Transform: m_ObjectHideFlags: 1 @@ -1382,6 +1525,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1416,22 +1560,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 1 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1439,16 +1577,25 @@ MonoBehaviour: 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_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 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 @@ -1456,6 +1603,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 @@ -1486,6 +1636,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 + m_BarnDoorAngle: 90 + m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1501,7 +1659,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 9 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1766079452 Light: m_ObjectHideFlags: 0 @@ -1561,6 +1729,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 &1766079453 @@ -1573,6 +1742,7 @@ Transform: m_LocalRotation: {x: 0.16987649, y: -0.029034924, z: -0.25718543, w: 0.95087045} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -1606,6 +1776,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2.3899999} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 345783686} m_RootOrder: 0 @@ -1620,7 +1791,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: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1635,10 +1806,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 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/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset new file mode 100644 index 00000000000..47071e5eb8c --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 996082102067431880} +--- !u!114 &996082102067431880 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..284763b28f4 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1801_MaterialQuality/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e933dcbd683c300418703544e87bd63e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset index b25adcbecfb..d334e59a614 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG/HDRP_Volume.asset @@ -29,21 +29,15 @@ MonoBehaviour: m_Name: HDShadowSettings m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 20 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 0 m_Value: 0.05 @@ -78,12 +72,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 200 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -93,11 +84,9 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.4660715 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} @@ -110,13 +99,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 1 + m_Value: + mode: 0 + customValue: 200 + additiveValue: 0 + multiplyValue: 0 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -132,31 +143,21 @@ MonoBehaviour: 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 @@ -166,6 +167,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &114827887035766406 MonoBehaviour: m_ObjectHideFlags: 3 @@ -179,13 +193,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity index eaf457a709f..86d143105d1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1900_AlphaTest_SG_a.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.31014416, g: 0.3259645, b: 0.36057484, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -152,6 +152,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -10.475559, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 1 @@ -189,6 +190,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -245,6 +247,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 113455552} - {fileID: 1780913221} @@ -279,6 +282,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94484690} m_RootOrder: 0 @@ -294,6 +298,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -360,6 +365,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 6, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 1 @@ -375,6 +381,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -439,6 +446,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1319188787} - {fileID: 115245477} @@ -488,6 +496,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 0 @@ -503,6 +512,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -569,6 +579,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3, y: 0.29, z: 3.1899986} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 1 @@ -606,6 +617,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -679,6 +691,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -711,6 +724,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -4.475559, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 2 @@ -748,6 +762,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -806,6 +821,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1823638298} m_RootOrder: 0 @@ -821,6 +837,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -903,6 +920,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -951,6 +969,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.98, y: 1, z: 2.8} m_LocalScale: {x: 18, y: 23.44351, z: 30} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -981,6 +1000,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: 11.65} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 266337116} - {fileID: 1063039922} @@ -1016,6 +1036,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 2 @@ -1031,6 +1052,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1098,6 +1120,7 @@ Transform: m_LocalRotation: {x: -0.0000020191073, y: -0.7071068, z: 0.7071068, w: 0.0000020191073} m_LocalPosition: {x: 2, y: -0.06, z: 3.4799995} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 2 @@ -1127,6 +1150,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1193,6 +1217,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -16.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 2 @@ -1236,6 +1261,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1294,6 +1320,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1823638298} m_RootOrder: 1 @@ -1309,6 +1336,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1373,6 +1401,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.37, y: 0.09998665, z: 16.256203} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1693407631} - {fileID: 1943064970} @@ -1409,6 +1438,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16.47556, y: 0.00001335144, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1585461826} m_RootOrder: 0 @@ -1446,6 +1476,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1504,6 +1535,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 2 @@ -1519,6 +1551,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1585,6 +1618,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3, y: -0.16, z: 3.1899986} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1766228066} m_RootOrder: 0 @@ -1622,6 +1656,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1680,6 +1715,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 6, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 625562289} m_RootOrder: 1 @@ -1695,6 +1731,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1740,6 +1777,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: m_LocalPosition.x value: -4.945982 @@ -1752,6 +1793,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -6.423647 objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -1764,14 +1809,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 114542892872663716, guid: e0446b620fbf66540b1b93f937834a01, type: 3} propertyPath: sharedProfile @@ -1817,6 +1854,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1585461826} - {fileID: 848590138} @@ -1855,6 +1893,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 172735911} m_RootOrder: 0 @@ -1870,6 +1909,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1954,6 +1994,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1986,6 +2027,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -22.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 3 @@ -2027,6 +2069,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2083,6 +2126,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.475559, y: 0.09998665, z: 16.256203} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 935026619} - {fileID: 68673008} @@ -2134,6 +2178,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2182,6 +2227,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.9799995, y: -1, z: 2.8} m_LocalScale: {x: 18, y: 23.44351, z: 30} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -2214,6 +2260,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -4.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 0 @@ -2253,6 +2300,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2294,6 +2342,10 @@ PrefabInstance: propertyPath: m_Name value: HDRP_Test_Camera objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -2 @@ -2306,6 +2358,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 19 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -2318,14 +2374,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -2337,14 +2385,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic size - value: 5 + propertyPath: field of view + value: 109.5 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_TargetTexture value: objectReference: {fileID: 0} + - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: orthographic size + value: 5 + objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_NormalizedViewPortRect.x @@ -2365,16 +2418,6 @@ PrefabInstance: propertyPath: m_NormalizedViewPortRect.height value: 1 objectReference: {fileID: 0} - - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: field of view - value: 109.5 - objectReference: {fileID: 0} - - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: renderPipeline @@ -2383,12 +2426,12 @@ PrefabInstance: type: 2} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2396,6 +2439,11 @@ PrefabInstance: propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 0} + - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114733060649624252, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: thingToDoBeforeTest.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -2408,62 +2456,67 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 - value: 70005818916701 + propertyPath: m_Version + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: backgroundColorHDR.b + value: 0.07843138 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableShadow - value: 0 + propertyPath: backgroundColorHDR.g + value: 0.182577 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableContactShadows + propertyPath: backgroundColorHDR.r + value: 0.23529412 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_ObsoleteFrameSettings.enableSSR value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableShadowMask + propertyPath: m_ObsoleteFrameSettings.enableSSAO value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSSR + propertyPath: m_ObsoleteFrameSettings.runSSRAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSSAO + propertyPath: m_ObsoleteFrameSettings.enableDecals value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableSubsurfaceScattering + propertyPath: m_ObsoleteFrameSettings.enableShadow value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransmission + propertyPath: m_ObsoleteFrameSettings.runSSAOAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableAtmosphericScattering + propertyPath: m_ObsoleteFrameSettings.shaderLitMode value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableVolumetrics + propertyPath: m_ObsoleteFrameSettings.enableDistortion value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableReprojectionForVolumetrics + propertyPath: m_ObsoleteFrameSettings.enableShadowMask value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2473,62 +2526,62 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.diffuseGlobalDimmer + propertyPath: m_ObsoleteFrameSettings.enablePostprocess value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.specularGlobalDimmer + propertyPath: m_ObsoleteFrameSettings.enableVolumetrics value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.shaderLitMode + propertyPath: m_ObsoleteFrameSettings.runLightListAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransparentPrepass + propertyPath: m_ObsoleteFrameSettings.enableAsyncCompute value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableMotionVectors + propertyPath: m_ObsoleteFrameSettings.enableTransmission value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableObjectMotionVectors + propertyPath: m_ObsoleteFrameSettings.diffuseGlobalDimmer value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableDecals + propertyPath: m_ObsoleteFrameSettings.enableMotionVectors value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableRoughRefraction + propertyPath: m_ObsoleteFrameSettings.enableOpaqueObjects value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableTransparentPostpass + propertyPath: m_ObsoleteFrameSettings.enableContactShadows value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableDistortion + propertyPath: m_ObsoleteFrameSettings.specularGlobalDimmer value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enablePostprocess + propertyPath: m_ObsoleteFrameSettings.enableRoughRefraction value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableOpaqueObjects + propertyPath: m_ObsoleteFrameSettings.runContactShadowsAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, @@ -2538,88 +2591,88 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableRealtimePlanarReflection + propertyPath: m_ObsoleteFrameSettings.enableTransparentPrepass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.enableAsyncCompute + propertyPath: m_ObsoleteFrameSettings.enableObjectMotionVectors value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runLightListAsync + propertyPath: m_ObsoleteFrameSettings.enableTransparentPostpass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runSSRAsync - value: 0 + propertyPath: m_RenderingPathCustomFrameSettings.bitDatas.data1 + value: 70005818916701 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runSSAOAsync + propertyPath: m_ObsoleteFrameSettings.enableSubsurfaceScattering value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runContactShadowsAsync + propertyPath: m_ObsoleteFrameSettings.runVolumeVoxelizationAsync value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.runVolumeVoxelizationAsync + propertyPath: m_ObsoleteFrameSettings.enableAtmosphericScattering value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableDeferredTileAndCluster + propertyPath: m_ObsoleteFrameSettings.enableRealtimePlanarReflection value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightEvaluation + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightVariants + propertyPath: m_ObsoleteFrameSettings.enableReprojectionForVolumetrics value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeMaterialVariants + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableBigTilePrepass value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableFptlForForwardOpaque + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightVariants value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableBigTilePrepass + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableFptlForForwardOpaque value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.isFptlEnabled + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeLightEvaluation value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.r - value: 0.23529412 + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableDeferredTileAndCluster + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0.182577 + propertyPath: m_ObsoleteFrameSettings.lightLoopSettings.enableComputeMaterialVariants + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 0.07843138 + propertyPath: xrLayout + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -2631,11 +2684,6 @@ PrefabInstance: propertyPath: ImageComparisonSettings.TargetHeight value: 800 objectReference: {fileID: 0} - - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, - type: 3} - propertyPath: xrLayout - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!4 &1766228066 stripped @@ -2672,6 +2720,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 12, y: 0, z: -0} m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94484690} m_RootOrder: 1 @@ -2687,6 +2736,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2765,6 +2815,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10, y: 0, z: -6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 464369562} - {fileID: 817363608} @@ -2799,6 +2850,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: -16, y: 0, z: -10.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 848590138} m_RootOrder: 1 @@ -2838,6 +2890,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2868,107 +2921,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2003875549 -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 &1132392170045009 GameObject: m_ObjectHideFlags: 0 @@ -3015,6 +2967,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.5, y: 10, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -3029,6 +2982,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 4.5, y: 10, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -3131,53 +3085,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 1 backgroundColorHDR: {r: 0.054901958, g: 0.14509805, b: 0.13433173, a: 0} clearDepth: 1 @@ -3195,15 +3102,18 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3212,6 +3122,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005818916700 @@ -3225,25 +3143,14 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 1 data2: 0 defaultFrameSettings: 0 ---- !u!114 &114777191937075999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1132392170045009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 7 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -3290,6 +3197,18 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 +--- !u!114 &114777191937075999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1132392170045009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} + m_Name: + m_EditorClassIdentifier: clearColorMode: 1 backgroundColorHDR: {r: 0.09642992, g: 0.078987196, b: 0.23584908, a: 0} clearDepth: 1 @@ -3307,15 +3226,18 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 m_Anamorphism: 0 flipYMode: 0 + xrRendering: 1 fullscreenPassthrough: 0 allowDynamicResolution: 0 customRenderingSettings: 1 @@ -3324,6 +3246,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 70005818916701 @@ -3337,9 +3267,57 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 1 data2: 0 defaultFrameSettings: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset index 0decdd2ce68..57bfd4fe7e4 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2003_Light_Parameters/HDRP_Default_Sky 1.asset @@ -3,31 +3,121 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 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: HDRP_Default_Sky 1 m_EditorClassIdentifier: - rotation: 160 - exposure: 0 - multiplier: 0.2 - resolution: 256 - updateMode: 0 - updatePeriod: 0 - lightingOverride: {fileID: 0} - atmosphericScatteringSettings: - type: 0 - colorMode: 1 - fogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - mipFogMaxMip: 1 - mipFogNear: 0 - mipFogFar: 1000 - linearFogDensity: 1 - linearFogStart: 500 - linearFogEnd: 1000 - expFogDistance: 100 - expFogDensity: 1 - skyHDRI: {fileID: 8900000, guid: fb0bf2eac2381484187ba8a68cdca165, type: 3} + active: 1 + rotation: + m_OverrideState: 0 + m_Value: 0 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 0 + multiplier: + m_OverrideState: 0 + m_Value: 1 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + 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 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + hdriSky: + m_OverrideState: 0 + m_Value: {fileID: 0} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset index 4056100d5db..a5f5dd0b48d 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2009_MultipleSkies/Sky_Static.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 @@ -51,12 +59,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -66,11 +71,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 0.46608552 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -80,10 +86,84 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset index 402320a6482..e37ca7317eb 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2110_IndirectController/Sky and Fog Settings Profile 1.asset @@ -426,7 +426,7 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity index 33d4081d9c3..b2fd68c3a8c 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights.unity @@ -119,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -148,6 +150,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.284, y: -2.0546, z: 0} m_LocalScale: {x: 1.5273, y: 1.5273, z: 1.5273} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 777764088} - {fileID: 1481904499} @@ -187,6 +190,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.32, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 400404840} - {fileID: 611033635} @@ -205,101 +209,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -316,6 +225,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -328,30 +248,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -364,6 +278,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -381,8 +299,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -459,6 +377,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -544,7 +464,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -565,10 +608,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -612,8 +657,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -631,7 +676,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -665,6 +710,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.201, y: -0.342, z: -1.262} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 229635437} m_RootOrder: 2 @@ -693,10 +739,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -759,6 +807,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: -0.342, z: -0.743} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 2 @@ -787,10 +836,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -853,6 +904,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 973768864} m_RootOrder: 0 @@ -881,10 +933,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -946,6 +1000,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.3011, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 5 @@ -961,10 +1016,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1028,6 +1085,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7390002, y: -0.44000039, z: -0.344} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1667517191} - {fileID: 703441991} @@ -1048,101 +1106,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1159,6 +1122,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1171,30 +1145,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -1207,6 +1175,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1224,8 +1196,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1302,6 +1274,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1387,7 +1361,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -1408,10 +1505,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1455,8 +1554,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -1474,7 +1573,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -1508,6 +1607,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1342837068} m_RootOrder: 0 @@ -1536,10 +1636,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1602,6 +1704,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.617, y: -0.342, z: -1.244} m_LocalScale: {x: 0.23569697, y: 0.23569697, z: 0.23569697} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 4 @@ -1630,10 +1733,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1696,6 +1801,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15513, y: 0.15513, z: 0.15513} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 703441991} m_RootOrder: 0 @@ -1724,10 +1830,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1789,6 +1897,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.54, y: -4.2893, z: 0} m_LocalScale: {x: 385.1731, y: 3.8790157, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 2 @@ -1804,10 +1913,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1869,6 +1980,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 21096330} m_RootOrder: 0 @@ -1884,10 +1996,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1949,6 +2063,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.638, y: 0.17, z: -1.724} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1091291962} m_Father: {fileID: 1098561660} @@ -1966,22 +2081,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1996,6 +2105,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2012,7 +2124,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 @@ -2043,8 +2157,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2060,7 +2180,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &437088011 Light: m_ObjectHideFlags: 0 @@ -2120,6 +2250,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 &475434060 @@ -2152,22 +2283,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - 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_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2182,6 +2307,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2198,7 +2326,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 @@ -2229,8 +2359,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -2246,7 +2382,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &475434063 Light: m_ObjectHideFlags: 0 @@ -2306,6 +2452,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 &475434064 @@ -2318,6 +2465,7 @@ Transform: m_LocalRotation: {x: 0.67753434, y: -0.27373418, z: 0.31773764, w: 0.6042017} m_LocalPosition: {x: 5.5331078, y: -15.559323, z: 38.527405} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -2351,6 +2499,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1183693015} m_RootOrder: 0 @@ -2379,10 +2528,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2444,6 +2595,7 @@ Transform: m_LocalRotation: {x: 0.1877043, y: -0.2808559, z: -0.09246844, w: 0.9366625} m_LocalPosition: {x: 0.043, y: 0.572, z: -2.515} m_LocalScale: {x: 4.265915, y: 4.265915, z: 4.265915} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1227910975} m_Father: {fileID: 1481904499} @@ -2461,22 +2613,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -2491,6 +2637,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -2507,7 +2656,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 @@ -2538,8 +2689,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -2555,7 +2712,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &513507484 Light: m_ObjectHideFlags: 0 @@ -2615,6 +2782,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 &516317389 @@ -2647,6 +2815,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.78, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1894137919} - {fileID: 1939633831} @@ -2667,101 +2836,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -2778,6 +2852,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -2790,30 +2875,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2826,6 +2905,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2843,8 +2926,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2921,6 +3004,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -3006,7 +3091,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -3027,10 +3235,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3074,8 +3284,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -3093,7 +3303,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -3126,6 +3336,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.87, y: -0.44842, z: 0} m_LocalScale: {x: 327.0256, y: 3.8790162, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 0 @@ -3141,10 +3352,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3207,6 +3420,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1891725936} m_RootOrder: 0 @@ -3235,10 +3449,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3300,6 +3516,7 @@ Transform: m_LocalRotation: {x: -0.00000043315177, y: 0.91290903, z: 0.40816325, w: -0.00000021523823} m_LocalPosition: {x: -0.062, y: -1.032, z: -0.534} m_LocalScale: {x: 1.9597181, y: 0.25220236, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1446512204} m_Father: {fileID: 21096330} @@ -3317,22 +3534,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3347,6 +3558,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3363,7 +3577,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 @@ -3394,8 +3610,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3411,7 +3633,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &611033640 Light: m_ObjectHideFlags: 0 @@ -3471,6 +3703,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.2520332} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &614162063 @@ -3501,6 +3734,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1657149774} m_RootOrder: 0 @@ -3516,10 +3750,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3581,6 +3817,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.638, y: 0.17, z: -1.724} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 854704549} m_Father: {fileID: 229635437} @@ -3598,22 +3835,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3628,6 +3859,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3644,7 +3878,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 @@ -3675,8 +3911,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3692,7 +3934,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &617468368 Light: m_ObjectHideFlags: 0 @@ -3752,6 +4004,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 &681941806 @@ -3782,6 +4035,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.70710677, w: 0.7071068} m_LocalPosition: {x: -10.7737, y: -2.4550998, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 15 @@ -3819,10 +4073,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3876,6 +4132,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: 0, z: -1.362} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 363705271} m_Father: {fileID: 229635437} @@ -3893,22 +4150,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -3923,6 +4174,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -3939,7 +4193,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 @@ -3970,8 +4226,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -3987,7 +4249,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &703441994 Light: m_ObjectHideFlags: 0 @@ -4047,6 +4319,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 &777764087 @@ -4079,6 +4352,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.32, y: -0.44000039, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1459415260} - {fileID: 1342837068} @@ -4097,101 +4371,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -4208,6 +4387,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -4220,30 +4410,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -4256,6 +4440,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -4273,8 +4461,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -4351,6 +4539,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -4436,7 +4626,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -4457,10 +4770,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4504,8 +4819,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -4523,7 +4838,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -4571,6 +4886,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1892780867} m_RootOrder: 0 @@ -4599,10 +4915,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4665,6 +4983,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15512997, y: 0.15512997, z: 0.15512997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 617468365} m_RootOrder: 0 @@ -4693,10 +5012,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4758,6 +5079,7 @@ Transform: m_LocalRotation: {x: 0.6015178, y: 0.4811885, z: 0.2609177, w: 0.5818557} m_LocalPosition: {x: -0.763, y: -0.111, z: -0.938} m_LocalScale: {x: 1.7410467, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 124817707} m_Father: {fileID: 516317390} @@ -4775,22 +5097,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -4805,6 +5121,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -4821,7 +5140,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 @@ -4852,8 +5173,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -4869,7 +5196,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &973768867 Light: m_ObjectHideFlags: 0 @@ -4929,6 +5266,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &980292724 @@ -4959,6 +5297,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.4602, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 4 @@ -4974,10 +5313,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5039,6 +5380,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1081795512} m_RootOrder: 0 @@ -5054,10 +5396,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5117,6 +5461,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.284, y: 1, z: 0} m_LocalScale: {x: 1.5273, y: 1.5273, z: 1.5273} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1098561660} - {fileID: 1102244886} @@ -5156,6 +5501,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 8.250001, y: 0.5199999, z: -0.364} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1509218596} m_Father: {fileID: 1022855023} @@ -5173,101 +5519,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -5284,6 +5535,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -5296,30 +5558,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -5332,6 +5588,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -5349,8 +5609,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -5427,6 +5687,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -5512,7 +5774,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -5533,10 +5918,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -5580,8 +5967,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -5599,7 +5986,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -5634,6 +6021,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.78, y: -0.44000006, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1003728041} - {fileID: 1640950923} @@ -5654,101 +6042,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -5765,6 +6058,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -5777,30 +6081,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -5813,6 +6111,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -5830,8 +6132,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -5908,6 +6210,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -5993,7 +6297,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -6014,10 +6441,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6061,8 +6490,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -6080,7 +6509,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6114,6 +6543,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15512997, y: 0.15512997, z: 0.15512997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 437088008} m_RootOrder: 0 @@ -6142,10 +6572,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6209,8 +6641,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -6228,7 +6660,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -6243,6 +6675,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.7390002, y: 0.5199999, z: -0.344} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1701459356} - {fileID: 1918702563} @@ -6263,101 +6696,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -6374,18 +6712,6 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} m_Shape: 1 m_BoxSize: {x: 10, y: 10, z: 10} m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} @@ -6397,19 +6723,36 @@ MonoBehaviour: m_SphereRadius: 2 m_SphereBlendDistance: 0 m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6422,6 +6765,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6439,8 +6786,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6517,6 +6864,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -6602,7 +6951,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -6623,10 +7095,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6690,6 +7164,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6299998, y: 0.5199999, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1363967057} - {fileID: 2002286226} @@ -6711,101 +7186,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -6822,6 +7202,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -6834,30 +7225,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 1 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -6870,6 +7255,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -6887,8 +7276,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -6965,6 +7354,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -7050,7 +7441,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 1 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 1 m_ObsoleteInfluenceSphereRadius: 2 @@ -7071,10 +7585,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7118,8 +7634,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -7137,7 +7653,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -7171,6 +7687,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15513, y: 0.15513, z: 0.15513} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1918702563} m_RootOrder: 0 @@ -7199,10 +7716,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7264,6 +7783,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10.062, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 8 @@ -7279,10 +7799,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7344,6 +7866,7 @@ Transform: m_LocalRotation: {x: 0.25129914, y: 0.19393967, z: 0.18873338, w: 0.92930937} m_LocalPosition: {x: -0.118, y: 0.541, z: -2.237} m_LocalScale: {x: 25.55, y: 25.55, z: 25.55} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1477123744} m_Father: {fileID: 1102244886} @@ -7361,22 +7884,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -7391,6 +7908,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -7407,7 +7927,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 @@ -7438,8 +7960,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7455,7 +7983,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1162519692 Light: m_ObjectHideFlags: 0 @@ -7515,6 +8053,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 &1180222689 @@ -7545,6 +8084,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.3806, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790162, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 3 @@ -7560,10 +8100,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7625,6 +8167,7 @@ Transform: m_LocalRotation: {x: -0.15337509, y: -0.11439086, z: 0.036997784, w: 0.9808272} m_LocalPosition: {x: 0.52, y: -1.015, z: 0.098} m_LocalScale: {x: 1.741047, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 505559235} m_Father: {fileID: 516317390} @@ -7642,22 +8185,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -7672,6 +8209,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -7688,7 +8228,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 @@ -7719,8 +8261,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -7736,7 +8284,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1183693018 Light: m_ObjectHideFlags: 0 @@ -7796,6 +8354,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1227157678 @@ -7826,6 +8385,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.46, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 12 @@ -7865,10 +8425,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7923,6 +8485,7 @@ Transform: m_LocalRotation: {x: -0.18770431, y: 0.2808559, z: 0.09246845, w: 0.9366625} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03636499, y: 0.036364995, z: 0.03636499} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 513507481} m_RootOrder: 0 @@ -7951,10 +8514,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8016,6 +8581,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.3870299, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 11 @@ -8055,10 +8621,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8113,6 +8681,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.551, y: -0.342, z: -0.743} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 2 @@ -8141,10 +8710,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8206,6 +8777,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 7.307, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 13 @@ -8245,10 +8817,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8303,6 +8877,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1640950923} m_RootOrder: 0 @@ -8331,10 +8906,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8396,6 +8973,7 @@ Transform: m_LocalRotation: {x: -0.00000043315177, y: 0.91290903, z: 0.40816325, w: -0.00000021523823} m_LocalPosition: {x: -0.062, y: -1.032, z: -0.534} m_LocalScale: {x: 1.9597181, y: 0.25220236, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 307748058} m_Father: {fileID: 777764088} @@ -8413,22 +8991,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -8443,6 +9015,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -8459,7 +9034,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 @@ -8490,8 +9067,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -8507,7 +9090,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1342837071 Light: m_ObjectHideFlags: 0 @@ -8567,6 +9160,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 2.2520332} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1349151176 @@ -8598,6 +9192,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1939633831} m_RootOrder: 0 @@ -8626,10 +9221,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8691,6 +9288,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1102244886} m_RootOrder: 0 @@ -8706,10 +9304,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8771,6 +9371,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8.081, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 9 @@ -8810,10 +9411,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8867,6 +9470,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.8, y: 3.3924, z: 0} m_LocalScale: {x: 330.4813, y: 3.8790157, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 1 @@ -8882,10 +9486,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -8948,6 +9554,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 611033635} m_RootOrder: 0 @@ -8976,10 +9583,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9041,6 +9650,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 777764088} m_RootOrder: 0 @@ -9056,10 +9666,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9122,6 +9734,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1162519689} m_RootOrder: 0 @@ -9150,10 +9763,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9217,6 +9832,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6299998, y: -0.44000039, z: -0.8276259} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1651282835} - {fileID: 513507481} @@ -9238,101 +9854,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -9349,6 +9870,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -9361,30 +9893,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -9397,6 +9923,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -9414,8 +9944,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -9492,6 +10022,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -9577,7 +10109,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -9598,10 +10253,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9645,8 +10302,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -9664,7 +10321,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -9695,6 +10352,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 525944184} - {fileID: 1432237597} @@ -9743,6 +10401,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1033495927} m_RootOrder: 0 @@ -9758,10 +10417,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9823,6 +10484,7 @@ Transform: m_LocalRotation: {x: -0.15337509, y: -0.11439086, z: 0.036997784, w: 0.9808272} m_LocalPosition: {x: 0.52, y: -1.015, z: 0.098} m_LocalScale: {x: 1.741047, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1588342439} m_Father: {fileID: 1081795512} @@ -9840,22 +10502,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -9870,6 +10526,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -9886,7 +10545,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 @@ -9917,8 +10578,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -9934,7 +10601,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1552828732 Light: m_ObjectHideFlags: 0 @@ -9994,6 +10671,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1588342438 @@ -10025,6 +10703,7 @@ Transform: m_LocalRotation: {x: -0.32809448, y: -0.22298495, z: -0.14287144, w: 0.9067632} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.006071623, y: 0.006071623, z: 0.006071624} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1552828729} m_RootOrder: 0 @@ -10053,10 +10732,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10102,48 +10783,48 @@ PrefabInstance: value: Background objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + propertyPath: m_RootOrder + value: 2 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + propertyPath: m_LocalScale.x + value: 1240.0674 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalPosition.z - value: 5.6 + propertyPath: m_LocalScale.y + value: 744.0404 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + propertyPath: m_LocalScale.z + value: 49.60269 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_LocalPosition.z + value: 5.6 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_RootOrder - value: 2 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.x - value: 1240.0674 + propertyPath: m_LocalRotation.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.y - value: 744.0404 + propertyPath: m_LocalRotation.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4415619047076708, guid: e6be141ec19d3554489da286b19b90b2, type: 3} - propertyPath: m_LocalScale.z - value: 49.60269 + propertyPath: m_LocalRotation.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 23096287020260212, guid: e6be141ec19d3554489da286b19b90b2, type: 3} @@ -10185,6 +10866,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.1419, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 6 @@ -10200,10 +10882,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10265,6 +10949,7 @@ Transform: m_LocalRotation: {x: 0.35460198, y: 0.72358406, z: 0.5515062, w: 0.21569538} m_LocalPosition: {x: -0.062, y: 0.698, z: -1.249} m_LocalScale: {x: 1.7410431, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1336388560} m_Father: {fileID: 1081795512} @@ -10282,22 +10967,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -10312,6 +10991,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -10328,7 +11010,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 @@ -10359,8 +11043,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -10376,7 +11066,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1640950926 Light: m_ObjectHideFlags: 0 @@ -10436,6 +11136,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.4778197} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1641932329 @@ -10466,6 +11167,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.70710677, w: 0.7071068} m_LocalPosition: {x: -10.7737, y: 1.3919002, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 14 @@ -10503,10 +11205,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10560,6 +11264,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 0 @@ -10575,10 +11280,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10634,126 +11341,32 @@ GameObject: m_IsActive: 1 --- !u!4 &1657149774 Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1657149773} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.250001, y: -0.44000039, z: -0.364} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 614162064} - m_Father: {fileID: 834778} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1657149775 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1657149773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10, y: 10, z: 10} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657149773} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.250001, y: -0.44000039, z: -0.364} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 614162064} + m_Father: {fileID: 834778} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1657149775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657149773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} + m_Name: + m_EditorClassIdentifier: m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -10770,6 +11383,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 4, y: 4, z: 4} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -10782,30 +11406,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 4, y: 4, z: 4} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 2 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -10818,6 +11436,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -10835,8 +11457,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -10913,6 +11535,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -10998,7 +11622,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10, y: 10, z: 10} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 2 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 2 @@ -11019,10 +11766,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 2 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11066,8 +11815,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 0 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -11085,7 +11834,7 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 8900000, guid: 2a4e9285ae01f6940a52a82fbb52b1e5, @@ -11119,11 +11868,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 0} + sharedProfile: {fileID: 11400000, guid: eaf61362679e76e4f929f6c59bb804e1, type: 2} --- !u!4 &1664385614 Transform: m_ObjectHideFlags: 0 @@ -11134,6 +11883,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -11166,6 +11916,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 229635437} m_RootOrder: 0 @@ -11181,10 +11932,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11247,10 +12000,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11294,6 +12049,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1098561660} m_RootOrder: 0 @@ -11341,6 +12097,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -11373,6 +12130,7 @@ Transform: m_LocalRotation: {x: 0.6015178, y: 0.4811885, z: 0.2609177, w: 0.5818557} m_LocalPosition: {x: -0.763, y: -0.111, z: -0.938} m_LocalScale: {x: 1.7410467, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 580852481} m_Father: {fileID: 1081795512} @@ -11390,22 +12148,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -11420,6 +12172,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11436,7 +12191,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 @@ -11467,8 +12224,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11484,7 +12247,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1891725939 Light: m_ObjectHideFlags: 0 @@ -11544,6 +12317,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.5945835} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1892780866 @@ -11574,6 +12348,7 @@ Transform: m_LocalRotation: {x: 0.25129914, y: 0.19393967, z: 0.18873338, w: 0.92930937} m_LocalPosition: {x: -0.118, y: 0.541, z: -2.237} m_LocalScale: {x: 25.55, y: 25.55, z: 25.55} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 833411595} m_Father: {fileID: 1481904499} @@ -11591,22 +12366,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -11621,6 +12390,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11637,7 +12409,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 @@ -11668,8 +12442,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11685,7 +12465,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1892780870 Light: m_ObjectHideFlags: 0 @@ -11745,6 +12535,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 &1894137918 @@ -11775,6 +12566,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.44276, y: 1.44276, z: 1.44276} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 516317390} m_RootOrder: 0 @@ -11790,10 +12582,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11855,6 +12649,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: 0, z: -1.362} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1104315614} m_Father: {fileID: 1098561660} @@ -11872,22 +12667,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -11902,6 +12691,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -11918,7 +12710,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 @@ -11949,8 +12743,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -11966,7 +12766,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1918702566 Light: m_ObjectHideFlags: 0 @@ -12026,6 +12836,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 &1939633830 @@ -12056,6 +12867,7 @@ Transform: m_LocalRotation: {x: 0.35460198, y: 0.72358406, z: 0.5515062, w: 0.21569538} m_LocalPosition: {x: -0.062, y: 0.698, z: -1.249} m_LocalScale: {x: 1.7410431, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1349151177} m_Father: {fileID: 516317390} @@ -12073,22 +12885,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 1 - m_SpotLightShape: 0 - m_AreaLightShape: 1 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12103,6 +12909,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12119,7 +12928,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 @@ -12150,8 +12961,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12167,7 +12984,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 1 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 1 + m_SpotLightShape: 0 + m_AreaLightShape: 1 --- !u!108 &1939633834 Light: m_ObjectHideFlags: 0 @@ -12227,6 +13054,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 1.4778197} m_UseBoundingSphereOverride: 1 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &1965177827 @@ -12236,6 +13064,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalPosition.x value: -1.28 @@ -12248,6 +13080,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -16.42 objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -12260,14 +13096,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -12284,13 +13112,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: orthographic size - value: 7.27 + propertyPath: far clip plane + value: 200 objectReference: {fileID: 0} - target: {fileID: 20109210616973140, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: far clip plane - value: 200 + propertyPath: orthographic size + value: 7.27 objectReference: {fileID: 0} - target: {fileID: 114270329781043846, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -12314,23 +13142,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.r - value: 0.41902542 + propertyPath: m_Version + value: 8 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.g - value: 0 + propertyPath: backgroundColorHDR.b + value: 1 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: backgroundColorHDR.b - value: 1 + propertyPath: backgroundColorHDR.g + value: 0 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} - propertyPath: m_Version - value: 7 + propertyPath: backgroundColorHDR.r + value: 0.41902542 objectReference: {fileID: 0} - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -12373,6 +13201,7 @@ Transform: m_LocalRotation: {x: -0.18770431, y: 0.2808559, z: 0.09246845, w: 0.9366625} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03636499, y: 0.036364995, z: 0.03636499} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2002286226} m_RootOrder: 0 @@ -12401,10 +13230,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12467,6 +13298,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.617, y: -0.342, z: -1.244} m_LocalScale: {x: 0.23569697, y: 0.23569697, z: 0.23569697} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481904499} m_RootOrder: 4 @@ -12495,10 +13327,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12560,6 +13394,7 @@ Transform: m_LocalRotation: {x: 0.1877043, y: -0.2808559, z: -0.09246844, w: 0.9366625} m_LocalPosition: {x: 0.043, y: 0.572, z: -2.515} m_LocalScale: {x: 4.265915, y: 4.265915, z: 4.265915} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1975323122} m_Father: {fileID: 1102244886} @@ -12577,22 +13412,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 50 m_EnableSpotReflector: 1 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -12607,6 +13436,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -12623,7 +13455,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 @@ -12654,8 +13488,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -12671,7 +13511,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &2002286229 Light: m_ObjectHideFlags: 0 @@ -12731,6 +13581,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 &2024496926 @@ -12761,6 +13612,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.234, y: 3.7, z: 0} m_LocalScale: {x: 1.9234164, y: 1.9234164, z: 1.9234164} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 10 @@ -12800,10 +13652,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12858,6 +13712,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.201, y: -0.342, z: -1.262} m_LocalScale: {x: 0.2357, y: 0.2357, z: 0.2357} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1098561660} m_RootOrder: 2 @@ -12886,10 +13741,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -12951,6 +13808,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -6.2215, y: 0.51179, z: 0} m_LocalScale: {x: 3.8790157, y: 193.95079, z: 175.23021} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1484532094} m_RootOrder: 7 @@ -12966,10 +13824,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset new file mode 100644 index 00000000000..424b5fccbcf --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2802844970268307975 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Scene Settings Profile + m_EditorClassIdentifier: + components: + - {fileID: -2802844970268307975} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta new file mode 100644 index 00000000000..aa5476f6bb6 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2204_ReflectionProbes_Lights/Scene Settings Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaf61362679e76e4f929f6c59bb804e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta new file mode 100644 index 00000000000..9b57dbf74ce --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cc02d11705d5db45ad1d2c20eeaff28 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity index 6d8cfd4ca65..dd4b39a1a8a 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace.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,6 +153,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.9772458, y: 1.2323846, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 6 @@ -188,10 +191,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -263,6 +268,7 @@ Transform: m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133565904} m_RootOrder: 0 @@ -279,22 +285,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -309,6 +309,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -325,7 +328,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 @@ -356,8 +361,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -373,7 +384,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &126516509 Light: m_ObjectHideFlags: 0 @@ -433,6 +454,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 &201797804 @@ -463,6 +485,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133565904} m_RootOrder: 1 @@ -479,22 +502,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -509,6 +526,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -525,7 +545,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 @@ -556,8 +578,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -573,7 +601,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &201797808 Light: m_ObjectHideFlags: 0 @@ -633,6 +671,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 &269421424 @@ -664,6 +703,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.757613, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 2 @@ -701,10 +741,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -777,6 +819,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.061559, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 3 @@ -814,10 +857,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -890,6 +935,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642561276} m_RootOrder: 0 @@ -904,9 +950,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 &335665651 MeshRenderer: @@ -919,10 +965,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -982,6 +1030,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1371258325} - {fileID: 2113193874} @@ -1026,6 +1075,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.526878, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 5 @@ -1063,10 +1113,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1139,6 +1191,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1347699, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 4 @@ -1176,10 +1229,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1252,6 +1307,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2020093, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 9 @@ -1289,10 +1345,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1367,7 +1425,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 1835560861516 + data2: 4539628424389459968 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -1414,51 +1537,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 1835560861516 - data2: 4539628424389459968 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!114 &717369283 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1475,16 +1553,23 @@ MonoBehaviour: TargetWidth: 900 TargetHeight: 300 PerPixelCorrectnessThreshold: 0.001 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.0001 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 waitFrames: 0 xrCompatible: 1 - checkMemoryAllocation: 0 xrThresholdMultiplier: 1 + checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} --- !u!20 &717369285 @@ -1540,6 +1625,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -7.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1580,6 +1666,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.004, y: 1.494, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 8 @@ -1624,10 +1711,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1671,6 +1760,55 @@ MonoBehaviour: forceTargetDimensions: {x: 200, y: 150} overrideTestSettings: 0 textMesh: {fileID: 745353039} +--- !u!1 &1099230126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1099230128} + - component: {fileID: 1099230127} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1099230127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099230126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: e7a5716611aa9124aa74579682e9613f, type: 2} +--- !u!4 &1099230128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099230126} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1133565903 GameObject: m_ObjectHideFlags: 0 @@ -1697,6 +1835,7 @@ Transform: m_LocalRotation: {x: -0.000000014901161, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 126516506} - {fileID: 201797805} @@ -1731,6 +1870,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 0 @@ -1746,10 +1886,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1812,6 +1954,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4902725, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 0 @@ -1849,10 +1992,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1924,6 +2069,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 3 @@ -1939,10 +2085,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2004,6 +2152,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 4 @@ -2019,10 +2168,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2084,6 +2235,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 2 @@ -2099,10 +2251,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2162,6 +2316,7 @@ Transform: m_LocalRotation: {x: -0.7660445, y: 0, z: 0, w: 0.64278764} m_LocalPosition: {x: 0, y: 0, z: 2.68} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 335665649} - {fileID: 1941161074} @@ -2196,6 +2351,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 1 @@ -2211,10 +2367,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2277,6 +2435,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.9567593, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 10 @@ -2314,10 +2473,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2387,6 +2548,7 @@ Transform: m_LocalRotation: {x: 0.0000007152557, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1268796610} - {fileID: 1673723394} @@ -2425,6 +2587,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731031573} m_RootOrder: 5 @@ -2440,10 +2603,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2504,6 +2669,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642561276} m_RootOrder: 1 @@ -2520,101 +2686,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4ee7c3a3b205a14a94094d01ff91d6b, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 20, y: 0.01, z: 20} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 1 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 1 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -2631,6 +2702,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 20, y: 0.01, z: 20} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -2643,30 +2725,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} + proxy: m_Shape: 0 - m_BoxSize: {x: 20, y: 0.01, z: 20} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - proxy: m_CSVersion: 1 m_ObsoleteSphereInfiniteProjection: 0 m_ObsoleteBoxInfiniteProjection: 0 - m_Shape: 0 - m_BoxSize: {x: 1, y: 1, z: 1} - m_SphereRadius: 1 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0.00000014883372, z: -0.000000009804136} mirrorRotationProxySpace: {x: -0.7071068, y: 0, z: 0, w: 0.70710677} + resolutionScalable: + m_Override: 512 + m_UseOverride: 1 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -2679,6 +2755,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -2696,8 +2776,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 1 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 1 fieldOfView: 90 projectionMatrix: e00: 1 @@ -2774,6 +2854,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -2859,13 +2941,136 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 - m_PlanarProbeVersion: 6 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 20, y: 0.01, z: 20} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 1 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 1 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 1 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 + m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} + m_PlanarProbeVersion: 7 m_ObsoleteCaptureNearPlane: 1 m_ObsoleteCaptureFarPlane: 1000 m_ObsoleteOverrideFieldOfView: 0 m_ObsoleteFieldOfViewOverride: 90 - m_LocalReferencePosition: {x: 0, y: 0.99999994, z: 0.000000059604645} --- !u!1 &2041147246 GameObject: m_ObjectHideFlags: 0 @@ -2895,6 +3100,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9772458, y: 1.2323846, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 7 @@ -2932,10 +3138,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3008,6 +3216,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.830824, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 355333141} m_RootOrder: 1 @@ -3045,10 +3254,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 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/2206_PlanarReflectionVFace/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset new file mode 100644 index 00000000000..e4d84e0f72c --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 8615675033778428043} +--- !u!114 &8615675033778428043 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..62d8ea524db --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2206_PlanarReflectionVFace/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7a5716611aa9124aa74579682e9613f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset index 0351529a4de..ab65c9b4760 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionCullingStencil/Scene Settings Profile.asset @@ -33,8 +33,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -44,11 +42,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -58,28 +57,18 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 top: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0.3962264, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 middle: m_OverrideState: 1 m_Value: {r: 0.040939845, g: 0.23264207, b: 0.3773585, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 bottom: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 gradientDiffusion: m_OverrideState: 1 m_Value: 1 @@ -99,43 +88,33 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 - min: 0 - max: 1 cascadeShadowSplit1: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 cascadeShadowSplit2: m_OverrideState: 1 m_Value: 0.3 - min: 0 - max: 1 cascadeShadowBorder0: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder1: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder2: m_OverrideState: 1 m_Value: 0 - min: 0 cascadeShadowBorder3: m_OverrideState: 1 m_Value: 0 - min: 0 --- !u!114 &114265733008192460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -152,8 +131,6 @@ MonoBehaviour: rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -163,11 +140,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -177,37 +155,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -227,6 +192,18 @@ MonoBehaviour: skyType: m_OverrideState: 1 m_Value: 3 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta new file mode 100644 index 00000000000..e497014c27e --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ca8ec8257727b242aa2c3bc221eecf5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity index 75af5f53f46..7f1b3e7ed03 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.unity +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace.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,6 +153,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.757613, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 2 @@ -206,10 +209,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -263,6 +268,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 5 @@ -278,10 +284,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -343,6 +351,7 @@ Transform: m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299818200} m_RootOrder: 0 @@ -359,22 +368,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -389,6 +392,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -405,7 +411,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 @@ -436,8 +444,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -453,7 +467,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &258139814 Light: m_ObjectHideFlags: 0 @@ -513,6 +537,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 &346223608 @@ -544,6 +569,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 870276854} m_RootOrder: 1 @@ -558,9 +584,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 &346223611 MeshRenderer: @@ -573,10 +599,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -638,6 +666,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 0 @@ -653,10 +682,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -718,6 +749,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1299818200} m_RootOrder: 1 @@ -734,22 +766,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 3 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -764,6 +790,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -780,7 +809,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 @@ -811,8 +842,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -828,7 +865,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &550499123 Light: m_ObjectHideFlags: 0 @@ -888,6 +935,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 &660003400 @@ -926,6 +974,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.5130266, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 8 @@ -988,10 +1037,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1043,6 +1094,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1245386076} - {fileID: 1892878110} @@ -1084,6 +1136,7 @@ Transform: m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} m_LocalPosition: {x: 0, y: 0.63, z: 2.17} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1345844771} - {fileID: 346223609} @@ -1118,6 +1171,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 1 @@ -1133,10 +1187,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1199,6 +1255,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1469717, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 4 @@ -1254,10 +1311,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1312,6 +1371,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4902725, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 0 @@ -1367,10 +1427,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1422,6 +1484,7 @@ Transform: m_LocalRotation: {x: 0.0000007152557, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 359289198} - {fileID: 1151135188} @@ -1458,6 +1521,7 @@ Transform: m_LocalRotation: {x: -0.000000014901161, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 258139811} - {fileID: 550499120} @@ -1492,6 +1556,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.00000011920929, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 870276854} m_RootOrder: 0 @@ -1508,101 +1573,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0ef8dc2c2eabfa4e8cb77be57a837c0, type: 3} m_Name: m_EditorClassIdentifier: - m_HDProbeVersion: 3 - m_ObsoleteInfiniteProjection: 1 - m_ObsoleteInfluenceVolume: - m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendDistance: 0 - m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_EditorSimplifiedModeBlendNormalDistance: 0 - m_EditorAdvancedModeEnabled: 0 - m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} - m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} - m_Version: 1 - m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} - m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 15.122394 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 1 - enableContactShadows: 1 - enableShadowMask: 1 - enableSSR: 0 - enableSSAO: 1 - enableSubsurfaceScattering: 1 - enableTransmission: 1 - enableAtmosphericScattering: 1 - enableVolumetrics: 1 - enableReprojectionForVolumetrics: 1 - enableLightLayers: 1 - enableExposureControl: 1 - diffuseGlobalDimmer: 1 - specularGlobalDimmer: 1 - shaderLitMode: 1 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 1 - enableMotionVectors: 1 - enableObjectMotionVectors: 1 - enableDecals: 1 - enableRoughRefraction: 1 - enableTransparentPostpass: 1 - enableDistortion: 1 - enablePostprocess: 1 - enableOpaqueObjects: 1 - enableTransparentObjects: 1 - enableRealtimePlanarReflection: 1 - enableMSAA: 0 - enableAsyncCompute: 1 - runLightListAsync: 1 - runSSRAsync: 1 - runSSAOAsync: 1 - runContactShadowsAsync: 1 - runVolumeVoxelizationAsync: 1 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 1 - enableComputeLightEvaluation: 1 - enableComputeLightVariants: 1 - enableComputeMaterialVariants: 1 - enableFptlForForwardOpaque: 1 - enableBigTilePrepass: 1 - isFptlEnabled: 1 - m_ObsoleteMultiplier: 1 - m_ObsoleteWeight: 1 - m_ObsoleteMode: 1 - m_ObsoleteLightLayers: 1 - m_ObsoleteCaptureSettings: - overrides: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} - clearDepth: 1 - cullingMask: - serializedVersion: 2 - m_Bits: 23 - useOcclusionCulling: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - projection: 0 - nearClipPlane: 0.3 - farClipPlane: 1000 - fieldOfView: 90 - orthographicSize: 5 - renderingPath: 0 - shadowDistance: 100 m_ProbeSettings: frustum: fieldOfViewMode: 1 @@ -1619,6 +1589,17 @@ MonoBehaviour: fadeDistance: 10000 rangeCompressionFactor: 1 influence: + m_Shape: 0 + m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 15.122394 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} m_EditorSimplifiedModeBlendDistance: 0 @@ -1631,30 +1612,24 @@ MonoBehaviour: m_Version: 1 m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} m_ObsoleteOffset: {x: 0, y: 0, z: 0} - m_Shape: 0 - m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} - m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} - m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} - m_BoxSideFadePositive: {x: 1, y: 1, z: 1} - m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} - m_SphereRadius: 15.122394 - m_SphereBlendDistance: 0 - m_SphereBlendNormalDistance: 0 proxy: - m_CSVersion: 1 - m_ObsoleteSphereInfiniteProjection: 0 - m_ObsoleteBoxInfiniteProjection: 0 m_Shape: 0 m_BoxSize: {x: 1, y: 1, z: 1} m_SphereRadius: 1 + m_CSVersion: 1 + m_ObsoleteSphereInfiniteProjection: 0 + m_ObsoleteBoxInfiniteProjection: 0 proxySettings: useInfluenceVolumeAsProxyVolume: 0 capturePositionProxySpace: {x: 0, y: 0, z: 0} captureRotationProxySpace: {x: 0, y: 0, z: 0, w: 1} mirrorPositionProxySpace: {x: 0, y: 0, z: 0} mirrorRotationProxySpace: {x: 0, y: 0, z: 0, w: 0} + resolutionScalable: + m_Override: 512 + m_UseOverride: 0 + m_Level: 0 + resolution: 0 cameraSettings: customRenderingSettings: 0 renderingPathCustomFrameSettings: @@ -1667,6 +1642,10 @@ MonoBehaviour: maximumLODLevel: 0 maximumLODLevelMode: 0 maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: @@ -1684,8 +1663,8 @@ MonoBehaviour: frustum: mode: 0 aspect: 1 - farClipPlane: 1000 - nearClipPlane: 0.3 + farClipPlaneRaw: 1000 + nearClipPlaneRaw: 0.3 fieldOfView: 90 projectionMatrix: e00: 1 @@ -1762,6 +1741,8 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 + roughReflections: 1 + distanceBasedRoughness: 0 m_ProbeSettingsOverride: probe: 0 camera: @@ -1847,7 +1828,130 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_EditorOnlyData: 0 + m_SHForNormalization: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_HasValidSHForNormalization: 0 + m_HDProbeVersion: 3 + m_ObsoleteInfiniteProjection: 1 + m_ObsoleteInfluenceVolume: + m_Shape: 0 + m_BoxSize: {x: 10.1, y: 10.1, z: 10.1} + m_BoxBlendDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_BoxBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_BoxSideFadePositive: {x: 1, y: 1, z: 1} + m_BoxSideFadeNegative: {x: 1, y: 1, z: 1} + m_SphereRadius: 15.122394 + m_SphereBlendDistance: 0 + m_SphereBlendNormalDistance: 0 + m_EditorAdvancedModeBlendDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendDistance: 0 + m_EditorAdvancedModeBlendNormalDistancePositive: {x: 0, y: 0, z: 0} + m_EditorAdvancedModeBlendNormalDistanceNegative: {x: 0, y: 0, z: 0} + m_EditorSimplifiedModeBlendNormalDistance: 0 + m_EditorAdvancedModeEnabled: 0 + m_EditorAdvancedModeFaceFadePositive: {x: 1, y: 1, z: 1} + m_EditorAdvancedModeFaceFadeNegative: {x: 1, y: 1, z: 1} + m_Version: 1 + m_ObsoleteSphereBaseOffset: {x: 0, y: 0, z: 0} + m_ObsoleteOffset: {x: 0, y: 0, z: 0} + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 1 + enableContactShadows: 1 + enableShadowMask: 1 + enableSSR: 0 + enableSSAO: 1 + enableSubsurfaceScattering: 1 + enableTransmission: 1 + enableAtmosphericScattering: 1 + enableVolumetrics: 1 + enableReprojectionForVolumetrics: 1 + enableLightLayers: 1 + enableExposureControl: 1 + diffuseGlobalDimmer: 1 + specularGlobalDimmer: 1 + shaderLitMode: 1 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 1 + enableMotionVectors: 1 + enableObjectMotionVectors: 1 + enableDecals: 1 + enableRoughRefraction: 1 + enableTransparentPostpass: 1 + enableDistortion: 1 + enablePostprocess: 1 + enableOpaqueObjects: 1 + enableTransparentObjects: 1 + enableRealtimePlanarReflection: 1 + enableMSAA: 0 + enableAsyncCompute: 1 + runLightListAsync: 1 + runSSRAsync: 1 + runSSAOAsync: 1 + runContactShadowsAsync: 1 + runVolumeVoxelizationAsync: 1 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 1 + enableComputeLightEvaluation: 1 + enableComputeLightVariants: 1 + enableComputeMaterialVariants: 1 + enableFptlForForwardOpaque: 1 + enableBigTilePrepass: 1 + isFptlEnabled: 1 + m_ObsoleteMultiplier: 1 + m_ObsoleteWeight: 1 + m_ObsoleteMode: 1 + m_ObsoleteLightLayers: 1 + m_ObsoleteCaptureSettings: + overrides: 0 + clearColorMode: 0 + backgroundColorHDR: {r: 0.023529412, g: 0.07058824, b: 0.1882353, a: 0} + clearDepth: 1 + cullingMask: + serializedVersion: 2 + m_Bits: 23 + useOcclusionCulling: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + projection: 0 + nearClipPlane: 0.3 + farClipPlane: 1000 + fieldOfView: 90 + orthographicSize: 5 + renderingPath: 0 + shadowDistance: 100 m_ReflectionProbeVersion: 9 m_ObsoleteInfluenceShape: 0 m_ObsoleteInfluenceSphereRadius: 3 @@ -1867,8 +1971,8 @@ ReflectionProbe: m_Enabled: 1 serializedVersion: 2 m_Type: 0 - m_Mode: 1 - m_RefreshMode: 1 + m_Mode: 2 + m_RefreshMode: 2 m_TimeSlicingMode: 0 m_Resolution: 128 m_UpdateFrequency: 0 @@ -1886,10 +1990,59 @@ ReflectionProbe: m_BlendDistance: 0 m_HDR: 1 m_BoxProjection: 0 - m_RenderDynamicObjects: 0 + m_RenderDynamicObjects: 1 m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1 &1358735759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1358735761} + - component: {fileID: 1358735760} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1358735760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1358735759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: f2b49193f73321a469fe116f6f4ba701, type: 2} +--- !u!4 &1358735761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1358735759} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1582879334 GameObject: m_ObjectHideFlags: 0 @@ -1919,6 +2072,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.061559, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 3 @@ -1974,10 +2128,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2031,6 +2187,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 2 @@ -2046,10 +2203,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2112,6 +2271,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2159861, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 9 @@ -2167,10 +2327,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2225,6 +2387,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.830824, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 1 @@ -2280,10 +2443,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2338,6 +2503,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.9707361, z: 1.5100002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 10 @@ -2393,10 +2559,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2450,6 +2618,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 3 @@ -2465,10 +2634,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2531,6 +2702,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.9894476, y: 1.2445863, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 7 @@ -2586,10 +2758,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2643,6 +2817,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -0.5, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1271753574} m_RootOrder: 4 @@ -2658,10 +2833,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2724,6 +2901,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.526878, y: -1.5252284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 5 @@ -2779,10 +2957,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2837,6 +3017,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.9894476, y: 1.2445863, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 718119711} m_RootOrder: 6 @@ -2892,10 +3073,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2999,16 +3182,23 @@ MonoBehaviour: TargetWidth: 900 TargetHeight: 300 PerPixelCorrectnessThreshold: 0.001 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.0001 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 doBeforeTest: m_PersistentCalls: m_Calls: [] captureFramerate: 0 waitFrames: 0 xrCompatible: 1 - checkMemoryAllocation: 0 xrThresholdMultiplier: 1 + checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: d7fe5f39d2c099a4ea1f1f610af309d7, type: 2} --- !u!114 &2123398363 @@ -3023,7 +3213,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 0 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 0 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70280697347933 + data2: 4539628424926265344 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -3070,51 +3325,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70280697347933 - data2: 4539628424926265344 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!4 &2123398364 Transform: m_ObjectHideFlags: 0 @@ -3125,6 +3335,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -7.38} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset new file mode 100644 index 00000000000..1da793d75f9 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6982758880431881621 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &11400000 +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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: -6982758880431881621} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta new file mode 100644 index 00000000000..5d1db2b718b --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2207_ReflectionProbeVFace/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2b49193f73321a469fe116f6f4ba701 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset index 562b56ea927..696162dbf06 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2210_ReflectionProbes_CaptureAtVolumeAnchor/Scene Settings Profile.asset @@ -29,13 +29,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 2 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 2 @@ -52,16 +60,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -96,12 +103,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -111,11 +115,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -125,37 +130,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0, g: 1, b: 0.09278011, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.88122773, g: 1, b: 0, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset index 40d18ef6e46..57a6000fa7b 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_PlanarProbeExposure/Global Volume Profile.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -119,19 +118,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -156,7 +151,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &-5120183026951368462 MonoBehaviour: m_ObjectHideFlags: 3 @@ -170,13 +164,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -209,12 +211,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -224,11 +223,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.0145767 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.38545167, y: 0.41750622, z: 0.5} @@ -241,34 +238,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 0} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -284,31 +282,21 @@ MonoBehaviour: 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 @@ -318,3 +306,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset index 27be71b38aa..b608a514539 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2220_SmoothPlanarReflection/Global Volume Profile.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -51,12 +59,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -66,11 +71,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.18875 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.4402014, y: 0.45416793, z: 0.5} @@ -83,34 +86,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 21bb9ef0ab3fe414bacf326d4f1d8ee2, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -126,31 +130,21 @@ MonoBehaviour: 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 @@ -160,3 +154,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset index 9b074ca40ff..657ac1e21d7 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/2x_Lighting/2701_TransparentSSR/Global Volume Profile.asset @@ -13,84 +13,114 @@ MonoBehaviour: m_Name: ScreenSpaceReflection m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 enabled: m_OverrideState: 1 m_Value: 1 - rayTracing: + tracing: m_OverrideState: 0 - m_Value: 0 - minSmoothness: + m_Value: 1 + m_MinSmoothness: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 - smoothnessFadeStart: + m_SmoothnessFadeStart: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 + usedAlgorithm: + m_OverrideState: 0 + m_Value: 0 depthBufferThickness: m_OverrideState: 1 m_Value: 0.006 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 + accumulationFactor: + m_OverrideState: 0 + m_Value: 0.75 + m_RayMaxIterations: + m_OverrideState: 1 + m_Value: 128 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 - rayLength: + textureLodBias: + m_OverrideState: 0 + m_Value: 1 + m_RayLength: m_OverrideState: 0 m_Value: 10 - min: 0.001 - max: 50 - clampValue: + m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 - denoise: + m_Denoise: m_OverrideState: 0 m_Value: 0 - denoiserRadius: + m_DenoiserRadius: m_OverrideState: 0 m_Value: 8 - min: 1 - max: 32 - mode: + m_AffectSmoothSurfaces: m_OverrideState: 0 - m_Value: 2 - upscaleRadius: + m_Value: 0 + mode: m_OverrideState: 0 m_Value: 2 - fullResolution: + m_FullResolution: m_OverrideState: 0 m_Value: 0 sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 - m_RayMaxIterations: + m_RayMaxIterationsRT: + m_OverrideState: 0 + m_Value: 48 +--- !u!114 &-1508565263743468274 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: m_OverrideState: 1 - m_Value: 128 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -105,3 +135,4 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: -3706306561061678719} + - {fileID: -1508565263743468274} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset index 9710f0685db..d36197d7152 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4011_MotionBlur/Scene Settings Profile.asset @@ -13,13 +13,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 2 @@ -36,50 +44,39 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 colorMode: m_OverrideState: 1 m_Value: 1 color: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} density: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 maxFogDistance: m_OverrideState: 1 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 1 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 1 m_Value: 1000 - min: 0 fogDistance: m_OverrideState: 1 m_Value: 200 - min: 0 fogBaseHeight: m_OverrideState: 1 m_Value: 0 fogHeightAttenuation: m_OverrideState: 1 m_Value: 0.2 - min: 0 - max: 1 --- !u!114 &-3990501575690934820 MonoBehaviour: m_ObjectHideFlags: 3 @@ -93,7 +90,6 @@ MonoBehaviour: m_Name: LiftGammaGain m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 lift: m_OverrideState: 0 m_Value: {x: 1, y: 1, z: 1, w: 0} @@ -116,16 +112,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -160,10 +155,6 @@ MonoBehaviour: m_Name: DepthOfField m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 - useQualitySettings: - m_OverrideState: 0 - m_Value: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -173,49 +164,42 @@ MonoBehaviour: focusDistance: m_OverrideState: 1 m_Value: 10 - min: 0.1 + focusDistanceMode: + m_OverrideState: 0 + m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 0 - min: 0 nearFocusEnd: m_OverrideState: 1 m_Value: 4 - min: 0 farFocusStart: m_OverrideState: 1 m_Value: 10 - min: 0 farFocusEnd: m_OverrideState: 1 m_Value: 20 - min: 0 m_NearSampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 5 - min: 3 - max: 8 m_NearMaxBlur: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 4 - min: 0 - max: 8 m_FarSampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 7 - min: 3 - max: 16 m_FarMaxBlur: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 8 - min: 0 - max: 16 - m_HighQualityFiltering: - m_OverrideState: 1 - m_Value: 1 m_Resolution: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 2 + m_HighQualityFiltering: + m_OverrideState: 0 + m_Value: 1 + m_PhysicallyBased: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -251,12 +235,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -266,11 +247,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 5.2074246 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -280,13 +262,87 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &2523018487990756456 MonoBehaviour: m_ObjectHideFlags: 3 @@ -300,12 +356,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -315,11 +368,12 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 1 m_Value: 20000 @@ -329,37 +383,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -376,41 +417,39 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 - useQualitySettings: - m_OverrideState: 0 - m_Value: 0 quality: m_OverrideState: 0 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 2.5 - min: 0 maximumVelocity: m_OverrideState: 0 m_Value: 200 - min: 0 - max: 1500 minimumVelocity: m_OverrideState: 0 m_Value: 2 - min: 0 - max: 64 + cameraMotionBlur: + m_OverrideState: 0 + m_Value: 1 + specialCameraClampMode: + m_OverrideState: 0 + m_Value: 0 + cameraVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 + cameraTranslationVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 cameraRotationVelocityClamp: m_OverrideState: 1 m_Value: 0.1 - min: 0 - max: 0.2 depthComparisonExtent: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 20 m_SampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 8 - min: 2 --- !u!114 &6271081758499213648 MonoBehaviour: m_ObjectHideFlags: 3 @@ -424,7 +463,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -434,52 +475,66 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} maxFogDistance: m_OverrideState: 1 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 1 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 1 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 maximumHeight: m_OverrideState: 0 m_Value: 50 - albedo: - m_OverrideState: 0 - m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 200 - min: 1 enableVolumetricFog: m_OverrideState: 0 m_Value: 0 - anisotropy: + albedo: m_OverrideState: 0 - m_Value: 0 - min: -1 - max: 1 + m_Value: {r: 1, g: 1, b: 1, a: 1} globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 + depthExtent: + m_OverrideState: 0 + m_Value: 64 + denoisingMode: + m_OverrideState: 0 + m_Value: 2 + anisotropy: + m_OverrideState: 0 + m_Value: 0 + sliceDistributionUniformity: + m_OverrideState: 0 + m_Value: 0.75 + m_FogControlMode: + m_OverrideState: 0 + m_Value: 0 + screenResolutionPercentage: + m_OverrideState: 0 + m_Value: 12.5 + volumeSliceCount: + m_OverrideState: 0 + m_Value: 64 + m_VolumetricFogBudget: + m_OverrideState: 0 + m_Value: 0.33 + m_ResolutionDepthRatio: + m_OverrideState: 0 + m_Value: 0.666 + directionalLightsOnly: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset index 21eb0a5201f..bc6f1a69033 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4014_PrecomputedVelocityAlembic/MotionBlurProfile.asset @@ -13,41 +13,39 @@ MonoBehaviour: m_Name: MotionBlur m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 intensity: m_OverrideState: 1 m_Value: 20 - min: 0 maximumVelocity: m_OverrideState: 1 m_Value: 200 - min: 0 - max: 1500 minimumVelocity: m_OverrideState: 1 m_Value: 2 - min: 0 - max: 64 + cameraMotionBlur: + m_OverrideState: 0 + m_Value: 1 + specialCameraClampMode: + m_OverrideState: 0 + m_Value: 0 + cameraVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 + cameraTranslationVelocityClamp: + m_OverrideState: 0 + m_Value: 0.05 cameraRotationVelocityClamp: m_OverrideState: 1 m_Value: 0.03 - min: 0 - max: 0.2 depthComparisonExtent: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 20 - cameraMotionBlur: - m_OverrideState: 0 - m_Value: 1 m_SampleCount: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 8 - min: 2 --- !u!114 &-3307415950195135037 MonoBehaviour: m_ObjectHideFlags: 3 @@ -61,13 +59,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -84,12 +90,9 @@ MonoBehaviour: m_Name: HDRISky m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 289 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -99,11 +102,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.4222085 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -116,34 +117,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 5fb993a599e7e9b4b825e1a28e6d2c07, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + scrollOrientation: + m_OverrideState: 1 + m_Value: + mode: 0 + customValue: 289 + additiveValue: 0 + multiplyValue: 0 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -159,31 +161,21 @@ MonoBehaviour: 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 @@ -193,6 +185,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset index 407ccee8257..c0291b7b671 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/4x_PostProcessing/4092_DRS-DLSS-Hardware/GlobalVolume Profile.asset @@ -20,8 +20,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -227,6 +233,9 @@ MonoBehaviour: focusDistance: m_OverrideState: 0 m_Value: 10 + focusDistanceMode: + m_OverrideState: 0 + m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 0.72 @@ -328,6 +337,9 @@ MonoBehaviour: focusDistance: m_OverrideState: 0 m_Value: 10 + focusDistanceMode: + m_OverrideState: 0 + m_Value: 0 nearFocusStart: m_OverrideState: 1 m_Value: 1.47 @@ -400,6 +412,12 @@ MonoBehaviour: skyAmbientMode: m_OverrideState: 0 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset index 248494ecfae..1d7d2de8219 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_Base.asset @@ -30,7 +30,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 0 @@ -38,8 +37,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 @@ -56,7 +61,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 1 quality: m_OverrideState: 0 m_Value: 1 @@ -69,32 +73,21 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 1, g: 0, b: 0, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 500 - min: 0 mipFogMaxMip: m_OverrideState: 1 m_Value: 0.7 - min: 0 - max: 1 mipFogNear: m_OverrideState: 1 m_Value: 25 - min: 0 mipFogFar: m_OverrideState: 1 m_Value: 100 - min: 0 baseHeight: m_OverrideState: 1 m_Value: 500 @@ -104,61 +97,42 @@ MonoBehaviour: meanFreePath: m_OverrideState: 1 m_Value: 50 - min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 albedo: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 1 m_Value: 25 - min: 0.1 denoisingMode: m_OverrideState: 1 m_Value: 0 anisotropy: m_OverrideState: 1 m_Value: 0 - min: -1 - max: 1 sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 - min: 0 - max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 1 m_Value: 25 - min: 6.25 - max: 100 volumeSliceCount: m_OverrideState: 1 m_Value: 128 - min: 1 - max: 1024 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 - min: 0 - max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 - min: 0 - max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -175,21 +149,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -224,13 +192,9 @@ MonoBehaviour: m_Name: VolumetricLightingController m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 depthExtent: m_OverrideState: 1 m_Value: 25 - min: 0.1 sliceDistributionUniformity: m_OverrideState: 1 m_Value: 0.75 - min: 0 - max: 1 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset index ae25336a76b..e6d895399a6 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5010_CloudLayer/Scene Settings Profile.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 0 m_Value: 0 @@ -119,19 +118,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -156,7 +151,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &-6901118705532630215 MonoBehaviour: m_ObjectHideFlags: 3 @@ -170,46 +164,33 @@ MonoBehaviour: m_Name: Tonemapping m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 2 toeStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 toeLength: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 shoulderStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 shoulderLength: m_OverrideState: 0 m_Value: 0.5 - min: 0 shoulderAngle: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 gamma: m_OverrideState: 0 m_Value: 1 - min: 0.001 lutTexture: m_OverrideState: 0 m_Value: {fileID: 0} lutContribution: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 --- !u!114 &-1982369472900735902 MonoBehaviour: m_ObjectHideFlags: 3 @@ -223,37 +204,27 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 2 threshold: m_OverrideState: 1 m_Value: 0 - min: 0 intensity: m_OverrideState: 1 m_Value: 0.15 - min: 0 - max: 1 scatter: m_OverrideState: 1 m_Value: 0.65 - min: 0 - max: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 dirtTexture: m_OverrideState: 0 m_Value: {fileID: 0} dirtIntensity: m_OverrideState: 0 m_Value: 0 - min: 0 anamorphic: m_OverrideState: 0 m_Value: 1 @@ -279,12 +250,9 @@ MonoBehaviour: m_Name: CloudLayer m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 1 opacity: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 @@ -294,20 +262,18 @@ MonoBehaviour: resolution: m_OverrideState: 0 m_Value: 1024 - shadowOpacity: + shadowMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 shadowTint: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 - shadowsResolution: - m_OverrideState: 1 - m_Value: 512 + shadowResolution: + m_OverrideState: 0 + m_Value: 256 + shadowSize: + m_OverrideState: 0 + m_Value: 500 layerA: cloudMap: m_OverrideState: 1 @@ -315,49 +281,41 @@ MonoBehaviour: opacityR: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 opacityG: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 opacityB: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 opacityA: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 tint: m_OverrideState: 1 m_Value: {r: 0.8396226, g: 0.66069466, b: 0.5029815, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 exposure: m_OverrideState: 1 m_Value: 0 distortionMode: m_OverrideState: 0 m_Value: 0 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 1 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -367,13 +325,9 @@ MonoBehaviour: steps: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 thickness: m_OverrideState: 1 m_Value: 0.36 - min: 0 - max: 1 castShadows: m_OverrideState: 1 m_Value: 1 @@ -384,49 +338,41 @@ MonoBehaviour: opacityR: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 opacityG: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 opacityB: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 opacityA: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 exposure: m_OverrideState: 1 m_Value: -3.5 distortionMode: m_OverrideState: 0 m_Value: 0 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 1 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -436,13 +382,9 @@ MonoBehaviour: steps: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 10 thickness: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 castShadows: m_OverrideState: 0 m_Value: 0 @@ -477,7 +419,6 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 @@ -485,8 +426,14 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 1 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 - m_Value: 1 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset index 9c9f5fddac2..c7c00db08d3 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/GlobalVolume.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 4 @@ -21,8 +20,14 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -39,7 +44,6 @@ MonoBehaviour: m_Name: Fog m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -52,32 +56,21 @@ MonoBehaviour: color: m_OverrideState: 0 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 0 m_Value: 5000 - min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 0 m_Value: 0 @@ -87,61 +80,42 @@ MonoBehaviour: meanFreePath: m_OverrideState: 0 m_Value: 400 - min: 1 enableVolumetricFog: m_OverrideState: 0 m_Value: 0 albedo: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 globalLightProbeDimmer: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - min: 0.1 denoisingMode: m_OverrideState: 0 m_Value: 2 anisotropy: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_FogControlMode: m_OverrideState: 0 m_Value: 0 screenResolutionPercentage: m_OverrideState: 0 m_Value: 12.5 - min: 6.25 - max: 50 volumeSliceCount: m_OverrideState: 0 m_Value: 64 - min: 1 - max: 512 m_VolumetricFogBudget: m_OverrideState: 0 m_Value: 0.33 - min: 0 - max: 1 m_ResolutionDepthRatio: m_OverrideState: 0 m_Value: 0.666 - min: 0 - max: 1 directionalLightsOnly: m_OverrideState: 0 m_Value: 0 @@ -175,12 +149,9 @@ MonoBehaviour: m_Name: PhysicallyBasedSky 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 @@ -190,11 +161,9 @@ MonoBehaviour: 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} @@ -207,7 +176,6 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 @@ -223,66 +191,42 @@ MonoBehaviour: planetaryRadius: m_OverrideState: 0 m_Value: 6378100 - min: 0 planetCenterPosition: m_OverrideState: 0 m_Value: {x: 0, y: -6378100, z: 0} airDensityR: m_OverrideState: 0 m_Value: 0.04534 - min: 0 - max: 1 airDensityG: m_OverrideState: 0 m_Value: 0.10237241 - min: 0 - max: 1 airDensityB: m_OverrideState: 0 m_Value: 0.23264056 - min: 0 - max: 1 airTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 airMaximumAltitude: m_OverrideState: 0 m_Value: 55261.973 - min: 0 aerosolDensity: m_OverrideState: 0 m_Value: 0.01192826 - min: 0 - max: 1 aerosolTint: m_OverrideState: 0 m_Value: {r: 0.9, g: 0.9, b: 0.9, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 aerosolMaximumAltitude: m_OverrideState: 0 m_Value: 8289.296 - min: 0 aerosolAnisotropy: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 numberOfBounces: m_OverrideState: 0 m_Value: 8 - min: 1 - max: 10 groundTint: m_OverrideState: 1 m_Value: {r: 0.31621575, g: 0.3454625, b: 0.3584906, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 groundColorTexture: m_OverrideState: 0 m_Value: {fileID: 0} @@ -292,7 +236,6 @@ MonoBehaviour: groundEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 planetRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -302,42 +245,27 @@ MonoBehaviour: spaceEmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 spaceRotation: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} colorSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaSaturation: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 alphaMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 horizonTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 zenithTint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 0 horizonZenithShift: m_OverrideState: 0 m_Value: 0 - min: -1 - max: 1 m_SkyVersion: 1 m_ObsoleteEarthPreset: m_OverrideState: 0 @@ -355,7 +283,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -461,19 +388,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -498,4 +421,3 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset index 766eb60a56b..baadbcb6211 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/8x_ShaderGraph/8107_UnlitShadowMatteAmbientOcclusion/Global Volume Profile.asset @@ -29,7 +29,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 2 @@ -39,80 +38,62 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 radius: m_OverrideState: 1 m_Value: 1 - min: 0.25 - max: 5 spatialBilateralAggressiveness: m_OverrideState: 0 m_Value: 0.15 - min: 0 - max: 1 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 - m_StepCount: + occluderMotionRejection: m_OverrideState: 0 - m_Value: 6 - min: 2 - max: 32 - m_FullResolution: + m_Value: 1 + receiverMotionRejection: m_OverrideState: 0 - m_Value: 0 + m_Value: 1 + m_StepCount: + m_OverrideState: 1 + m_Value: 16 + m_FullResolution: + m_OverrideState: 1 + m_Value: 1 m_MaximumRadiusInPixels: - m_OverrideState: 0 - m_Value: 40 - min: 16 - max: 256 + m_OverrideState: 1 + m_Value: 80 m_BilateralUpsample: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 m_DirectionCount: - m_OverrideState: 0 - m_Value: 2 - min: 1 - max: 6 + m_OverrideState: 1 + m_Value: 4 m_RayLength: - m_OverrideState: 0 - m_Value: 0.5 - min: 0 - max: 50 + m_OverrideState: 1 + m_Value: 20 m_SampleCount: - m_OverrideState: 0 - m_Value: 1 - min: 1 - max: 64 + m_OverrideState: 1 + m_Value: 8 m_Denoise: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: - m_OverrideState: 0 - m_Value: 1 - min: 0.001 - max: 1 + m_OverrideState: 1 + m_Value: 0.65 --- !u!114 &5586737667120579711 MonoBehaviour: m_ObjectHideFlags: 3 @@ -126,13 +107,21 @@ MonoBehaviour: m_Name: VisualEnvironment m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -149,12 +138,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -164,11 +150,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 5.20731 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.4714623, y: 0.4714616, z: 0.5} @@ -181,34 +165,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -224,31 +209,21 @@ MonoBehaviour: 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 @@ -258,3 +233,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset index 5ecdae9653e..b15653f0ac6 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9700_CustomPass_FullScreen/Scene Settings Profile.asset @@ -12,4 +12,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: Scene Settings Profile m_EditorClassIdentifier: - components: [] + components: + - {fileID: 525883688551753881} +--- !u!114 &525883688551753881 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset index 5ecdae9653e..8eee8ea84c1 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/Scene Settings Profile.asset @@ -12,4 +12,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} m_Name: Scene Settings Profile m_EditorClassIdentifier: - components: [] + components: + - {fileID: 2568591178948852223} +--- !u!114 &2568591178948852223 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset index f19f670668c..af61475a199 100644 --- a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9702_CustomPass_API/Scene Settings Profile.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 1 m_Value: 0 @@ -61,17 +60,97 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + limitMinCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -12 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 18 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + limitMaxCurveMap: + m_OverrideState: 0 + m_Value: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -10 + value: -8 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 20 + value: 22 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 adaptationMode: m_OverrideState: 1 m_Value: 1 adaptationSpeedDarkToLight: m_OverrideState: 1 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 1 m_Value: 1 - min: 0.001 + weightTextureMask: + m_OverrideState: 0 + m_Value: {fileID: 0} + histogramPercentages: + m_OverrideState: 0 + m_Value: {x: 40, y: 90} + histogramUseCurveRemapping: + m_OverrideState: 0 + m_Value: 0 + targetMidGray: + m_OverrideState: 0 + m_Value: 0 + centerAroundExposureTarget: + m_OverrideState: 0 + m_Value: 0 + proceduralCenter: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + proceduralRadii: + m_OverrideState: 0 + m_Value: {x: 0.3, y: 0.3} + maskMinIntensity: + m_OverrideState: 0 + m_Value: -30 + maskMaxIntensity: + m_OverrideState: 0 + m_Value: 30 + proceduralSoftness: + m_OverrideState: 0 + m_Value: 0.5 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86,3 +165,35 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: -6322084644017855310} + - {fileID: 1052189620847248129} +--- !u!114 &1052189620847248129 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab index 3a8d6f51094..1ca0b685b78 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5870183540159428618} - {fileID: 5870183540305807088} @@ -64,6 +65,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 0 @@ -148,10 +150,12 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -166,7 +170,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 72204296650588 @@ -180,13 +191,14 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 0 defaultFrameSettings: 0 - m_Version: 7 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -261,6 +273,7 @@ Transform: m_LocalRotation: {x: 0.31429538, y: 0.3457062, z: -0.124121174, w: 0.8753854} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 1 @@ -422,6 +435,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -437,7 +451,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -477,6 +490,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 4 @@ -493,7 +507,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -512,6 +526,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: 0dac2c76303e9a74e87ebaaea403fadc, type: 2} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!1 &5870183541445562935 GameObject: m_ObjectHideFlags: 0 @@ -540,6 +556,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 3 @@ -701,6 +718,7 @@ MonoBehaviour: m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -716,7 +734,6 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 @@ -756,6 +773,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1862371348089163216} m_RootOrder: 2 @@ -799,6 +817,7 @@ VisualEffect: m_Array: [] --- !u!73398921 &5870183541744189769 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -816,15 +835,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity index ffd1ba377a6..429267bc182 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP.unity @@ -191,6 +191,11 @@ PrefabInstance: propertyPath: m_Name value: HDRP objectReference: {fileID: 0} + - target: {fileID: 5870183540159428619, guid: 0ecfb9aa1bc41c049aab025283598019, + type: 3} + propertyPath: m_Version + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5870183541744189769, guid: 0ecfb9aa1bc41c049aab025283598019, type: 3} propertyPath: m_Materials.Array.data[0] diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset index 48ab8fcdf1f..4b454e5a79d 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric Settings Profile.asset @@ -30,12 +30,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 rotation: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 1 m_Value: 0 @@ -45,11 +42,9 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -62,37 +57,24 @@ MonoBehaviour: updatePeriod: m_OverrideState: 1 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 1 m_Value: 0 sunSize: m_OverrideState: 1 m_Value: 0.04 - min: 0 - max: 1 sunSizeConvergence: m_OverrideState: 1 m_Value: 5 - min: 1 - max: 10 atmosphereThickness: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 5 skyTint: m_OverrideState: 1 m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 groundColor: m_OverrideState: 1 m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 enableSunDisk: m_OverrideState: 1 m_Value: 1 @@ -109,13 +91,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 2 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 @@ -132,21 +122,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -181,7 +165,9 @@ MonoBehaviour: m_Name: Fog m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 + quality: + m_OverrideState: 0 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -191,70 +177,66 @@ MonoBehaviour: color: m_OverrideState: 1 m_Value: {r: 0, g: 0, b: 0, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 maxFogDistance: m_OverrideState: 1 m_Value: 300 - min: 0 mipFogMaxMip: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 mipFogNear: m_OverrideState: 0 m_Value: 0 - min: 0 mipFogFar: m_OverrideState: 0 m_Value: 1000 - min: 0 baseHeight: m_OverrideState: 1 m_Value: 1 maximumHeight: m_OverrideState: 1 m_Value: 20 - albedo: - m_OverrideState: 1 - m_Value: {r: 1, g: 0.8970642, b: 0, a: 1} - hdr: 0 - showAlpha: 1 - showEyeDropper: 1 meanFreePath: m_OverrideState: 1 m_Value: 2.5 - min: 1 enableVolumetricFog: m_OverrideState: 1 m_Value: 1 - anisotropy: + albedo: m_OverrideState: 1 - m_Value: 0.5 - min: -1 - max: 1 + m_Value: {r: 1, g: 0.8970642, b: 0, a: 1} globalLightProbeDimmer: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 1 depthExtent: m_OverrideState: 0 m_Value: 64 - min: 0.1 + denoisingMode: + m_OverrideState: 0 + m_Value: 2 + anisotropy: + m_OverrideState: 1 + m_Value: 0.5 sliceDistributionUniformity: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 - filter: + m_FogControlMode: + m_OverrideState: 0 + m_Value: 0 + screenResolutionPercentage: + m_OverrideState: 0 + m_Value: 12.5 + volumeSliceCount: + m_OverrideState: 0 + m_Value: 64 + m_VolumetricFogBudget: + m_OverrideState: 0 + m_Value: 0.33 + m_ResolutionDepthRatio: + m_OverrideState: 0 + m_Value: 0.666 + directionalLightsOnly: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity index b9eae9a9b30..5c9ebe6c49c 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRPFogVolumetric.unity @@ -167,6 +167,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -215,6 +216,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.155, y: 5.969, z: 24.196} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -300,6 +302,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -15.42, y: 5.24, z: 15.99} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -316,53 +319,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 clearColorMode: 0 backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} clearDepth: 1 @@ -380,10 +336,12 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 m_Aperture: 16 + m_FocusDistance: 10 m_BladeCount: 5 m_Curvature: {x: 2, y: 11} m_BarrelClipping: 0.25 @@ -398,6 +356,14 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 m_RenderingPathCustomFrameSettings: bitDatas: data1: 17521319083853 @@ -411,12 +377,60 @@ MonoBehaviour: sssQualityMode: 0 sssQualityLevel: 0 sssCustomSampleBudget: 20 + msaaMode: 1 materialQuality: 0 renderingPathCustomFrameSettingsOverrideMask: mask: data1: 0 data2: 0 defaultFrameSettings: 0 + m_Version: 8 + m_ObsoleteRenderingPath: 0 + m_ObsoleteFrameSettings: + overrides: 0 + enableShadow: 0 + enableContactShadows: 0 + enableShadowMask: 0 + enableSSR: 0 + enableSSAO: 0 + enableSubsurfaceScattering: 0 + enableTransmission: 0 + enableAtmosphericScattering: 0 + enableVolumetrics: 0 + enableReprojectionForVolumetrics: 0 + enableLightLayers: 0 + enableExposureControl: 1 + diffuseGlobalDimmer: 0 + specularGlobalDimmer: 0 + shaderLitMode: 0 + enableDepthPrepassWithDeferredRendering: 0 + enableTransparentPrepass: 0 + enableMotionVectors: 0 + enableObjectMotionVectors: 0 + enableDecals: 0 + enableRoughRefraction: 0 + enableTransparentPostpass: 0 + enableDistortion: 0 + enablePostprocess: 0 + enableOpaqueObjects: 0 + enableTransparentObjects: 0 + enableRealtimePlanarReflection: 0 + enableMSAA: 0 + enableAsyncCompute: 0 + runLightListAsync: 0 + runSSRAsync: 0 + runSSAOAsync: 0 + runContactShadowsAsync: 0 + runVolumeVoxelizationAsync: 0 + lightLoopSettings: + overrides: 0 + enableDeferredTileAndCluster: 0 + enableComputeLightEvaluation: 0 + enableComputeLightVariants: 0 + enableComputeMaterialVariants: 0 + enableFptlForForwardOpaque: 0 + enableBigTilePrepass: 0 + isFptlEnabled: 0 --- !u!114 &270514561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -467,11 +481,17 @@ MonoBehaviour: TargetWidth: 512 TargetHeight: 512 PerPixelCorrectnessThreshold: 0 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 AverageCorrectnessThreshold: 0.001 + IncorrectPixelsThreshold: 0.0000038146973 UseHDR: 0 UseBackBuffer: 0 ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 captureFrameRate: 20 + fixedTimeStepScale: 1 simulateTime: 5.95 xrCompatible: 1 --- !u!4 &299252011 @@ -484,6 +504,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -520,6 +541,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: c0b22c5d4a882d04997474b651f04a14, type: 2} m_StaticLightingSkyUniqueID: 0 + m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!114 &493913624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -532,7 +555,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -547,6 +570,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -595,6 +619,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -643,6 +668,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.77, y: 1.59, z: 35.26} m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -718,12 +744,14 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 24} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!73398921 &674445798 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -733,6 +761,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -740,19 +769,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -816,6 +832,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -864,6 +881,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.32, y: 3.14, z: 28.52} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -888,6 +906,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1382437304 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -897,6 +916,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -904,19 +924,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -990,6 +997,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 27} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -1037,6 +1045,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1085,6 +1094,7 @@ Transform: m_LocalRotation: {x: -0.20829226, y: 0.32973933, z: 0.07485625, w: 0.9177597} m_LocalPosition: {x: -14.19, y: 5.72, z: 26.04} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -1109,6 +1119,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1486284230 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1118,6 +1129,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1125,19 +1137,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1211,6 +1210,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 30} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -1235,6 +1235,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1527903407 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1244,6 +1245,7 @@ VFXRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -1251,19 +1253,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1337,6 +1326,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.41, y: 5.19, z: 33} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -1431,6 +1421,7 @@ Transform: m_LocalRotation: {x: 0.29175767, y: -0.050442208, z: 0.12781513, w: 0.9465708} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1447,22 +1438,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - 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.141593 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -1477,6 +1462,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -1526,9 +1514,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.15 @@ -1544,10 +1537,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!1 &2067038241 GameObject: m_ObjectHideFlags: 0 @@ -1591,6 +1591,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1639,6 +1640,7 @@ Transform: m_LocalRotation: {x: -0.20829226, y: 0.32973933, z: 0.07485625, w: 0.9177597} m_LocalPosition: {x: -18.95, y: 4.17, z: 26.04} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset index 104ccf34a4c..9da6c7ed2b3 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/HDRP_SceneSetting.asset @@ -83,16 +83,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 + directionalTransmissionMultiplier: + m_OverrideState: 0 + m_Value: 1 cascadeShadowSplitCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 1 m_Value: 0.05 @@ -127,13 +126,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 3 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 1 @@ -150,12 +157,9 @@ MonoBehaviour: m_Name: GradientSky 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 @@ -165,11 +169,12 @@ MonoBehaviour: 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 @@ -179,28 +184,18 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 top: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 middle: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 bottom: m_OverrideState: 1 m_Value: {r: 0, g: 0.2509804, b: 0.49803922, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 gradientDiffusion: m_OverrideState: 0 m_Value: 1 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity index e132c6795f2..ae6caad07e6 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit.unity @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -151,22 +153,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 6000 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -181,6 +177,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -197,7 +196,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 @@ -228,8 +229,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -245,7 +252,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &196708717 Light: m_ObjectHideFlags: 0 @@ -305,6 +322,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 &196708718 @@ -317,6 +335,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.0313, y: 0.6618, z: 0.0736} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -352,7 +371,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 7 + clearColorMode: 1 + backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearDepth: 1 + volumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + volumeAnchorOverride: {fileID: 0} + antialiasing: 0 + SMAAQuality: 2 + dithering: 1 + stopNaNs: 0 + taaSharpenStrength: 0.6 + TAAQuality: 1 + taaHistorySharpening: 0.35 + taaAntiFlicker: 0.5 + taaMotionVectorRejection: 0 + taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 + physicalParameters: + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + flipYMode: 0 + xrRendering: 1 + fullscreenPassthrough: 0 + allowDynamicResolution: 0 + customRenderingSettings: 0 + invertFaceCulling: 0 + probeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + hasPersistentHistory: 0 + allowDeepLearningSuperSampling: 1 + deepLearningSuperSamplingUseCustomQualitySettings: 0 + deepLearningSuperSamplingQuality: 0 + deepLearningSuperSamplingUseCustomAttributes: 0 + deepLearningSuperSamplingUseOptimalSettings: 1 + deepLearningSuperSamplingSharpening: 0 + exposureTarget: {fileID: 0} + materialMipBias: 0 + m_RenderingPathCustomFrameSettings: + bitDatas: + data1: 70005811052381 + data2: 4539628424657829888 + lodBias: 1 + lodBiasMode: 0 + lodBiasQualityLevel: 0 + maximumLODLevel: 0 + maximumLODLevelMode: 0 + maximumLODLevelQualityLevel: 0 + sssQualityMode: 0 + sssQualityLevel: 0 + sssCustomSampleBudget: 20 + msaaMode: 1 + materialQuality: 0 + renderingPathCustomFrameSettingsOverrideMask: + mask: + data1: 0 + data2: 0 + defaultFrameSettings: 0 + m_Version: 8 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -399,51 +483,6 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - clearColorMode: 1 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 1 - stopNaNs: 0 - taaSharpenStrength: 0.6 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 70005811052381 - data2: 4539628424657829888 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 --- !u!81 &762437740 AudioListener: m_ObjectHideFlags: 0 @@ -505,6 +544,7 @@ Transform: m_LocalRotation: {x: 0.003963616, y: 0.9929508, z: -0.035168, w: 0.11312072} m_LocalPosition: {x: -0.43010604, y: 0.22291613, z: 2.0188065} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -539,22 +579,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 0 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 2 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -569,6 +603,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -585,7 +622,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 @@ -616,8 +655,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -633,7 +678,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &774493051 Light: m_ObjectHideFlags: 0 @@ -693,6 +748,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 &774493052 @@ -705,6 +761,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -729,6 +786,7 @@ GameObject: m_IsActive: 1 --- !u!73398921 &1001802347 VFXRenderer: + serializedVersion: 1 m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -738,6 +796,7 @@ VFXRenderer: m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -745,8 +804,6 @@ VFXRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -780,6 +837,7 @@ VisualEffect: m_InitialEventNameOverriden: 0 m_StartSeed: 0 m_ResetSeedOnPlay: 0 + m_ResourceVersion: 1 m_PropertySheet: m_Float: m_Array: [] @@ -813,6 +871,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.076, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -846,7 +905,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -861,6 +920,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9172678, y: -0.07954121, z: 5.81527} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -894,7 +954,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -909,6 +969,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.9119453, y: 10.3260975, z: 2.7467709} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -943,22 +1004,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 9 - m_ObsoleteShadowResolutionTier: 1 - m_ObsoleteUseShadowQualitySettings: 0 - m_ObsoleteCustomShadowResolution: 512 - m_ObsoleteContactShadows: 0 - m_PointlightHDType: 0 - m_SpotLightShape: 0 - m_AreaLightShape: 0 m_Intensity: 60000 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 + m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 m_LightUnit: 0 m_FadeDistance: 10000 + m_VolumetricFadeDistance: 10000 m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 @@ -973,6 +1028,9 @@ MonoBehaviour: m_ApplyRangeAttenuation: 1 m_DisplayAreaLightEmissiveMesh: 0 m_AreaLightCookie: {fileID: 0} + m_IESPoint: {fileID: 0} + m_IESSpot: {fileID: 0} + m_IncludeForRayTracing: 1 m_AreaLightShadowCone: 120 m_UseScreenSpaceShadows: 0 m_InteractsWithSky: 1 @@ -989,7 +1047,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 @@ -1020,8 +1080,14 @@ MonoBehaviour: m_NormalBias: 0.75 m_SlopeBias: 0.5 m_ShadowUpdateMode: 0 + m_AlwaysDrawDynamicShadows: 0 + m_UpdateShadowOnLightMovement: 0 + m_CachedShadowTranslationThreshold: 0.01 + m_CachedShadowAngularThreshold: 0.5 m_BarnDoorAngle: 90 m_BarnDoorLength: 0.05 + m_preserveCachedShadow: 0 + m_OnDemandShadowRenderOnPlacement: 1 m_ShadowCascadeRatios: - 0.05 - 0.2 @@ -1037,7 +1103,17 @@ MonoBehaviour: useOldInspector: 0 useVolumetric: 1 featuresFoldout: 1 - showAdditionalSettings: 0 + m_AreaLightEmissiveMeshShadowCastingMode: 0 + m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 + m_AreaLightEmissiveMeshLayer: -1 + m_Version: 11 + m_ObsoleteShadowResolutionTier: 1 + m_ObsoleteUseShadowQualitySettings: 0 + m_ObsoleteCustomShadowResolution: 512 + m_ObsoleteContactShadows: 0 + m_PointlightHDType: 0 + m_SpotLightShape: 0 + m_AreaLightShape: 0 --- !u!108 &1853046272 Light: m_ObjectHideFlags: 0 @@ -1097,6 +1173,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 &1853046273 @@ -1109,6 +1186,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0555, y: 0.6618, z: 0.1548} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset index 495be543386..ab7511dfbb4 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLitVolumeProfile.asset @@ -13,12 +13,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -28,11 +25,12 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.46608552 - min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} desiredLuxValue: m_OverrideState: 0 m_Value: 20000 @@ -42,13 +40,87 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} + distortionMode: + m_OverrideState: 0 + m_Value: 0 + flowmap: + m_OverrideState: 0 + m_Value: {fileID: 0} + upperHemisphereOnly: + m_OverrideState: 0 + m_Value: 1 + scrollOrientation: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 + scrollSpeed: + m_OverrideState: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 + 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 + plateRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexRotation: + m_OverrideState: 0 + m_Value: 0 + plateTexOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0} + blendAmount: + m_OverrideState: 0 + m_Value: 0 + shadowTint: + m_OverrideState: 0 + m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + pointLightShadow: + m_OverrideState: 0 + m_Value: 0 + dirLightShadow: + m_OverrideState: 0 + m_Value: 0 + rectLightShadow: + m_OverrideState: 0 + m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &-60721801795345313 MonoBehaviour: m_ObjectHideFlags: 3 @@ -62,13 +134,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 1 m_Value: 3 diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs index a3b74156caf..06b4e581719 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs @@ -17,7 +17,7 @@ public sealed class VisualEnvironment : VolumeComponent /// Type of clouds that should be used for rendering. public NoInterpIntParameter cloudType = new NoInterpIntParameter(0); /// Defines the way the ambient probe should be computed. - public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Static); + public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Dynamic); /// Controls the global orientation of the wind relative to the X world vector. [Header("Wind")] From 11a6af1005d3813e8a473d88ecac2d10d61231b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Chapelain?= <57442369+remi-chapelain@users.noreply.github.com> Date: Thu, 2 Sep 2021 17:38:07 +0200 Subject: [PATCH 024/149] [HDRP] Adding information about SSGI and Emissive incompatibility in documentation and override (#5468) * adding bit of info * Adding links * fixing typo * Helpbox in SSGI override * Apply suggestions from code review Co-authored-by: emilybrown1 <88374601+emilybrown1@users.noreply.github.com> Co-authored-by: emilybrown1 <88374601+emilybrown1@users.noreply.github.com> --- .../Documentation~/Override-Screen-Space-GI.md | 6 ++++++ .../RenderPipeline/Raytracing/GlobalIlluminationEditor.cs | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md index a96db2acad0..5656481a28b 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md @@ -74,6 +74,12 @@ HDRP uses the [Volume](Volumes.md) framework to calculate SSGI, so to enable and ## Limitations +In Deferred rendering mode, Screen Space Global Illumination and Ray-Traced Global Illumination share a buffer with emissive, which overwrites emissive data. +There are multiple ways to recover the emissive contribution of the scene materials: +* Disable [Receive SSR/SSGI](snippets/shader-properties/surface-options/receive-ssr.md) flag on the emissive materials. +* Use [Force Forward Emissive](snippets/shader-properties/advanced-options/force-forward-emissive.md) on the emissive materials. +* Use Forward rendering. + ### Screen-space global illumination * When rendering [Reflection Probes](Reflection-Probe.md) screen space global illumination is not supported. diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs index b27e5d13731..f8352fb003e 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs @@ -173,7 +173,10 @@ public override void OnInspectorGUI() } PropertyField(m_Enable); - + if (m_Enable.value.boolValue) + EditorGUILayout.HelpBox("Real-time Global Illumination overwrites emissive data in deferred rendering mode. To recover the emissive contribution, either use Force Forward Emissive or disable Receive SSR/SSGI flag on the emissive materials.", MessageType.Info); + EditorGUILayout.Space(); + // If ray tracing is supported display the content of the volume component if (HDRenderPipeline.buildPipelineSupportsRayTracing) PropertyField(m_Tracing); From 09b70e744c0e9fac477a50ab533766392b1b6446 Mon Sep 17 00:00:00 2001 From: Kleber Garcia Date: Thu, 2 Sep 2021 11:39:56 -0400 Subject: [PATCH 025/149] Updating DLSS documentation (#5433) * Updating DLSS documentation * Updating grammar reviewed by technical writter Vic --- .../deep-learning-super-sampling-in-hdrp.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md b/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md index 01fb78b7b3f..56a1fea77ab 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md @@ -8,7 +8,16 @@ This section includes HDRP-specific requirements and compatibility information f ### Platforms -HDRP does not support DLSS for **Windows** using **x86** architecture (Win32). To build your project for **Windows**, use **x86_64** architecture (Win64). +HDRP supports DLSS on the following platforms: + +DirectX 11 on Windows 64 bit +DirectX 12 on Windows 64 bit +Vulkan on Windows 64 bit +HDRP does not support DLSS for Metal, Linux, Windows using x86 architecture (Win32), or any other platform. + +To build your project for Windows, use x86_64 architecture (Win64). + +For information about the hardware requirements of DLSS, see [NVIDIA'S DLSS requirements](https://developer.nvidia.com/nvidia-dlss-access-program). ## Using DLSS From cdde2a570dc31c71ef1c652393d9beef21c3b91e Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Thu, 2 Sep 2021 17:41:41 +0200 Subject: [PATCH 026/149] Some ref image metas (#5513) --- .../5015_VolumetricCloudsProbeAndSky.png.meta | 110 +++++++++++++++++- ...15_VolumetricClouds_ProbeGradient.png.meta | 110 +++++++++++++++++- .../5015_VolumetricCloudsProbeAndSky.png.meta | 110 +++++++++++++++++- ...15_VolumetricClouds_ProbeGradient.png.meta | 110 +++++++++++++++++- .../5015_VolumetricCloudsProbeAndSky.png.meta | 110 +++++++++++++++++- ...15_VolumetricClouds_ProbeGradient.png.meta | 110 +++++++++++++++++- .../5015_VolumetricCloudsProbeAndSky.png.meta | 110 +++++++++++++++++- ...15_VolumetricClouds_ProbeGradient.png.meta | 110 +++++++++++++++++- .../5015_VolumetricCloudsProbeAndSky.png.meta | 110 +++++++++++++++++- 9 files changed, 981 insertions(+), 9 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta index d5de43c98d9..281302a2482 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: 3fe8efd72fc82384aa78a911d018243f \ No newline at end of file +guid: 3fe8efd72fc82384aa78a911d018243f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricClouds_ProbeGradient.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricClouds_ProbeGradient.png.meta index 953607cd453..a4b12dfee4d 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricClouds_ProbeGradient.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5015_VolumetricClouds_ProbeGradient.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: a43ae1154e6284243b22f7d7625c4ed1 \ No newline at end of file +guid: a43ae1154e6284243b22f7d7625c4ed1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricCloudsProbeAndSky.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricCloudsProbeAndSky.png.meta index b60a7f03d09..fe17c33b570 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricCloudsProbeAndSky.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricCloudsProbeAndSky.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: e223f90b1ded77847a4f22c2d5486f78 \ No newline at end of file +guid: e223f90b1ded77847a4f22c2d5486f78 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricClouds_ProbeGradient.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricClouds_ProbeGradient.png.meta index 58bac275d05..6f1b0c5c14a 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricClouds_ProbeGradient.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5015_VolumetricClouds_ProbeGradient.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: 352af974b7b237b4e9c3c5b66d1c2e8a \ No newline at end of file +guid: 352af974b7b237b4e9c3c5b66d1c2e8a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricCloudsProbeAndSky.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricCloudsProbeAndSky.png.meta index d48b90769ea..f57752de6d1 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricCloudsProbeAndSky.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricCloudsProbeAndSky.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: fc844b2824e1c574c83d26ef23e8c469 \ No newline at end of file +guid: fc844b2824e1c574c83d26ef23e8c469 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricClouds_ProbeGradient.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricClouds_ProbeGradient.png.meta index a25c6567f22..35b04ccab4c 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricClouds_ProbeGradient.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5015_VolumetricClouds_ProbeGradient.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: a8e1bd16f0bc71c448f04be1d123100e \ No newline at end of file +guid: a8e1bd16f0bc71c448f04be1d123100e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricCloudsProbeAndSky.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricCloudsProbeAndSky.png.meta index 1a6cbcdd091..3618c21cfb4 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricCloudsProbeAndSky.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricCloudsProbeAndSky.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: a7a2b83587eab0e43bf7a7699d52762b \ No newline at end of file +guid: a7a2b83587eab0e43bf7a7699d52762b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricClouds_ProbeGradient.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricClouds_ProbeGradient.png.meta index 74362ebe4ca..0156b1990fb 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricClouds_ProbeGradient.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5015_VolumetricClouds_ProbeGradient.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: a51404a2c745754499c352a2b6c0f02b \ No newline at end of file +guid: a51404a2c745754499c352a2b6c0f02b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta index d8b2b2f4bcb..89457c36f69 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5015_VolumetricCloudsProbeAndSky.png.meta @@ -1,2 +1,110 @@ fileFormatVersion: 2 -guid: 65124f4237b40c940bb60859c3d4ddac \ No newline at end of file +guid: 65124f4237b40c940bb60859c3d4ddac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 2cf8ee5aa613944a4865a05b3228d4031c17111c Mon Sep 17 00:00:00 2001 From: Liis Kivistik Date: Thu, 2 Sep 2021 17:52:25 +0200 Subject: [PATCH 027/149] [Yamato] Update retry pattern (#5515) --- .yamato/script/log_scripts/utils/execution_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/script/log_scripts/utils/execution_log.py b/.yamato/script/log_scripts/utils/execution_log.py index 94cb1d7f921..1ba648de33a 100644 --- a/.yamato/script/log_scripts/utils/execution_log.py +++ b/.yamato/script/log_scripts/utils/execution_log.py @@ -34,7 +34,7 @@ def get_patterns(self): # Successful retries have no concrete pattern to match: the only difference with failed retry is that it does not contain 'Failed after n retries', # but no working regex for matching multiline against a negative lookahead was found yet. # Therefore, this pattern must come after failed retry pattern (python logic will handle recognizing this block as a successful retry) - 'pattern': r'(Retrying)', + 'pattern': r'(######################################## Retrying ########################################)', 'tags': [TAG_SUCCESFUL_RETRY], 'conclusion': 'success', 'add_if': add_successful_retry_if From 2a2bee03d0c9d838273907ff3e4c1f755ce452c4 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Thu, 2 Sep 2021 20:02:41 +0200 Subject: [PATCH 028/149] Fix change to debug sphere and create a new one just for probes (#5512) * Revert sphere * New mesh separate for APV --- .../RenderPipeline/HDRenderPipeline.cs | 2 +- .../HDRenderPipelineRuntimeResources.cs | 2 + .../HDRenderPipelineRuntimeResources.asset | 6 +- .../Mesh/ProbeDebugSphere.fbx | 3 + .../Mesh/ProbeDebugSphere.fbx.meta | 105 ++++++++++++++++++ .../RenderPipelineResources/Mesh/Sphere.fbx | 4 +- .../Mesh/Sphere.fbx.meta | 47 +++----- 7 files changed, 134 insertions(+), 35 deletions(-) create mode 100644 com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx create mode 100644 com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta 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 496a29b671e..e2cb48863a2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -378,7 +378,7 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) ProbeReferenceVolume.instance.Initialize(new ProbeVolumeSystemParameters() { memoryBudget = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeMemoryBudget, - probeDebugMesh = defaultResources.assets.sphereMesh, + probeDebugMesh = defaultResources.assets.probeDebugSphere, probeDebugShader = defaultResources.shaders.probeVolumeDebugShader, sceneBounds = m_GlobalSettings.GetOrCreateAPVSceneBounds(), shBands = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeSHBands diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs index c8f9135dc75..dfc76f6b674 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs @@ -473,6 +473,8 @@ public sealed class AssetResources public Mesh emissiveQuadMesh; [Reload("Runtime/RenderPipelineResources/Mesh/Sphere.fbx")] public Mesh sphereMesh; + [Reload("Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx")] + public Mesh probeDebugSphere; } public ShaderResources shaders; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset index 82c7307c4c5..17097924dd3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset @@ -263,11 +263,11 @@ MonoBehaviour: defaultHDRISky: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} defaultCloudMap: {fileID: 2800000, guid: 57a33fc2476a01644865bfde5f06e2f4, type: 3} shaderGraphs: - objectIDPS: {fileID: -6465566751694194690, guid: 89daf81f8e8f6634da726cbca859ca38, - type: 3} + objectIDPS: {fileID: -6465566751694194690, guid: 89daf81f8e8f6634da726cbca859ca38, type: 3} assets: defaultDiffusionProfile: {fileID: 11400000, guid: 2b7005ba3a4d8474b8cdc34141ad766e, type: 2} emissiveCylinderMesh: {fileID: 2534964839176971238, guid: accb6d90f0d50fe4ca0f68159b4323de, type: 3} emissiveQuadMesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} - sphereMesh: {fileID: 532591105809680800, guid: f7f013a81640a284ea38df61c509ff9a, type: 3} + sphereMesh: {fileID: 4300000, guid: 9e0af751bc36ea146940ba245193e28c, type: 3} + probeDebugSphere: {fileID: 532591105809680800, guid: b979359990531a2489ebd7a0ef0f9f01, type: 3} m_Version: 4 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx new file mode 100644 index 00000000000..a225668ca63 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:696831e63b190731502326c428323eb77bab6dd8fb9285030f6ec6467d49aab4 +size 24092 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta new file mode 100644 index 00000000000..258ea8fb66a --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: b979359990531a2489ebd7a0ef0f9f01 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx index a225668ca63..cceb1e76926 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:696831e63b190731502326c428323eb77bab6dd8fb9285030f6ec6467d49aab4 -size 24092 +oid sha256:a68cc8459e0e19ff6ea5eba075edbd0da492df1e0ed43b5a16143986da4f9d7b +size 51632 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta index de4ec0ea6a8..fb87f7716b2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta @@ -1,11 +1,17 @@ fileFormatVersion: 2 -guid: f7f013a81640a284ea38df61c509ff9a +guid: 9e0af751bc36ea146940ba245193e28c ModelImporter: - serializedVersion: 21202 - internalIDToNameTable: [] + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2100000: No Name + 2300000: //RootNode + 3300000: //RootNode + 4300000: Sphere externalObjects: {} materials: - materialImportMode: 2 + importMaterials: 1 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -14,7 +20,6 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -32,53 +37,40 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 + optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 - bakeAxisConversion: 0 preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 0 - meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] importAnimation: 1 + copyAvatar: 0 humanDescription: - serializedVersion: 3 + serializedVersion: 2 human: [] skeleton: [] armTwist: 0.5 @@ -88,17 +80,14 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 0 humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 additionalBone: 0 userData: assetBundleName: From cadd7b7ef1e22a69b46d6fb8c4c95502656900e7 Mon Sep 17 00:00:00 2001 From: JulienIgnace-Unity Date: Thu, 2 Sep 2021 20:03:33 +0200 Subject: [PATCH 029/149] Fixed Visual Environment components to use static ambient. (#5517) --- .../Global Volume Profile.asset | 91 +++++----- .../Global Volume Profile.asset | 91 +++++----- .../901_Materials_HDRP_Variants.asset | 155 ++++++++-------- .../902_Materials_SG_Variants.asset | 167 ++++++++---------- .../TransparentRTR.asset | 52 +++++- .../LargeAmbientOcclusionDenoised.asset | 94 +++++----- .../LargeAmbientOcclusionNoisy.asset | 94 +++++----- .../LocalAmbeintOcclusionDenoised.asset | 66 ++++--- .../LocalAmbientOcclusionNoisy.asset | 101 +++++------ .../Global Volume Profile.asset | 89 +++++----- .../RayTracedReflectionsPerfFull.asset | 92 +++++----- .../RayTracedReflectionsPerfHalf.asset | 92 +++++----- .../RayTracedReflectionsQuality.asset | 92 +++++----- ...ctionsAndGlobalIlluminationCollision.asset | 7 +- ...RayTracedReflectionsQuality_Indirect.asset | 151 ++++++++-------- ...ayTracedReflectionsQuality_Untouched.asset | 82 ++++----- .../Reflection_LastBounce_Fallback_Both.asset | 2 +- .../Reflection_LastBounce_Fallback_None.asset | 2 +- ...Reflection_LastBounce_Fallback_Probe.asset | 2 +- .../Reflection_LastBounce_Fallback_Sky.asset | 2 +- .../Reflection_RayMiss_FallbackBoth.asset | 2 +- .../Reflection_RayMiss_FallbackNone.asset | 2 +- .../Reflection_RayMiss_FallbackProbe.asset | 2 +- .../Reflection_RayMiss_FallbackSky.asset | 2 +- 24 files changed, 729 insertions(+), 803 deletions(-) diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/107_ReflectionsHybridFullRes/Global Volume Profile.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/107_ReflectionsHybridFullRes/Global Volume Profile.asset index 3185cc7e4f7..da855338ecc 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/107_ReflectionsHybridFullRes/Global Volume Profile.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/107_ReflectionsHybridFullRes/Global Volume Profile.asset @@ -25,13 +25,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 reflectSky: m_OverrideState: 1 m_Value: 1 @@ -41,44 +37,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 1 m_Value: serializedVersion: 2 m_Bits: 4294967295 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.01 m_ClampValue: m_OverrideState: 1 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -91,17 +84,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 1 m_Value: 32 - min: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -237,19 +225,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -274,7 +258,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &2196858695157234729 MonoBehaviour: m_ObjectHideFlags: 3 @@ -295,8 +278,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -316,8 +305,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -327,11 +314,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.1871386 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.44071853, y: 0.45464578, z: 0.5} @@ -344,34 +329,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: ec03f1d4a2587b749bc197def8c88c8e, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -387,31 +373,21 @@ MonoBehaviour: 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 @@ -421,3 +397,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_ReflectionsHybridHalfRes/Global Volume Profile.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_ReflectionsHybridHalfRes/Global Volume Profile.asset index b4e5d44e61e..93f32d3e372 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_ReflectionsHybridHalfRes/Global Volume Profile.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_ReflectionsHybridHalfRes/Global Volume Profile.asset @@ -25,13 +25,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 reflectSky: m_OverrideState: 1 m_Value: 1 @@ -41,44 +37,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 1 m_Value: serializedVersion: 2 m_Bits: 4294967295 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.01 m_ClampValue: m_OverrideState: 1 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -91,17 +84,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 1 m_Value: 32 - min: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -237,19 +225,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -274,7 +258,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &2196858695157234729 MonoBehaviour: m_ObjectHideFlags: 3 @@ -295,8 +278,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -316,8 +305,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -327,11 +314,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.1871386 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.44071853, y: 0.45464578, z: 0.5} @@ -344,34 +329,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: ec03f1d4a2587b749bc197def8c88c8e, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -387,31 +373,21 @@ MonoBehaviour: 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 @@ -421,3 +397,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/901_Materials_HDRP_Variants.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/901_Materials_HDRP_Variants.asset index b4012e69cde..d971c4e3794 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/901_Materials_HDRP_Variants.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/901_Materials_HDRP_Variants.asset @@ -24,17 +24,18 @@ MonoBehaviour: maxDepth: m_OverrideState: 1 m_Value: 2 - min: 1 - max: 10 rayLength: m_OverrideState: 1 m_Value: 50 - min: 0 minSmoothness: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounce: + m_OverrideState: 0 + m_Value: 3 --- !u!114 &-6997134701456348657 MonoBehaviour: m_ObjectHideFlags: 3 @@ -51,8 +52,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -62,11 +61,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.4660715 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} @@ -79,34 +76,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -122,31 +120,21 @@ MonoBehaviour: 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 @@ -156,6 +144,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-6105801733217658778 MonoBehaviour: m_ObjectHideFlags: 3 @@ -172,8 +173,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -183,11 +182,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -200,34 +197,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -243,31 +241,21 @@ MonoBehaviour: 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 @@ -277,6 +265,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -369,7 +370,6 @@ MonoBehaviour: cameraClusterRange: m_OverrideState: 1 m_Value: 50 - min: 0.001 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -506,19 +506,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -543,7 +539,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &3564700782616824417 MonoBehaviour: m_ObjectHideFlags: 3 @@ -569,13 +564,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 1 reflectSky: m_OverrideState: 1 m_Value: 1 @@ -585,44 +576,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.001 m_ClampValue: m_OverrideState: 1 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -635,17 +623,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 1 m_Value: 8 - min: 1 - max: 32 bounceCount: m_OverrideState: 1 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -666,8 +649,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/902_Materials_SG_Variants.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/902_Materials_SG_Variants.asset index eac7532050a..65be9ca6a76 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/902_Materials_SG_Variants.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/902_Materials_SG_Variants.asset @@ -24,17 +24,18 @@ MonoBehaviour: maxDepth: m_OverrideState: 1 m_Value: 2 - min: 1 - max: 10 rayLength: m_OverrideState: 1 m_Value: 50 - min: 0 minSmoothness: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounce: + m_OverrideState: 0 + m_Value: 3 --- !u!114 &-7315284083965622969 MonoBehaviour: m_ObjectHideFlags: 3 @@ -59,22 +60,15 @@ MonoBehaviour: maximumSamples: m_OverrideState: 0 m_Value: 256 - min: 1 - max: 4096 minimumDepth: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 10 maximumDepth: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 10 maximumIntensity: m_OverrideState: 0 m_Value: 10 - min: 0 --- !u!114 &-6997134701456348657 MonoBehaviour: m_ObjectHideFlags: 3 @@ -91,8 +85,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -102,11 +94,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0.4660715 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} @@ -119,34 +109,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -162,31 +153,21 @@ MonoBehaviour: 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 @@ -196,6 +177,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-6105801733217658778 MonoBehaviour: m_ObjectHideFlags: 3 @@ -212,8 +206,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -223,11 +215,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -240,34 +230,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -283,31 +274,21 @@ MonoBehaviour: 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 @@ -317,6 +298,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -409,17 +403,12 @@ MonoBehaviour: maxShadowDistance: m_OverrideState: 1 m_Value: 500 - min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 m_Value: 1 - min: 0 - max: 1 cascadeShadowSplitCount: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 4 cascadeShadowSplit0: m_OverrideState: 0 m_Value: 0 @@ -457,7 +446,6 @@ MonoBehaviour: cameraClusterRange: m_OverrideState: 1 m_Value: 50 - min: 0.001 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -596,19 +584,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -633,7 +617,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &3564700782616824417 MonoBehaviour: m_ObjectHideFlags: 3 @@ -659,13 +642,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 1 m_Value: 0.5 - min: 0 - max: 1 reflectSky: m_OverrideState: 1 m_Value: 1 @@ -675,44 +654,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.001 m_ClampValue: m_OverrideState: 1 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -725,17 +701,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 1 m_Value: 8 - min: 1 - max: 32 bounceCount: m_OverrideState: 1 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -756,8 +727,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/TransparentRTR.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/TransparentRTR.asset index 77cb33b96cd..011484a2f2b 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/TransparentRTR.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/905_Materials_SG_TransparentRTR/TransparentRTR.asset @@ -46,24 +46,29 @@ MonoBehaviour: hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 614ae0372d7dfb847a1926990e89fa06, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -103,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-4010149921267514920 MonoBehaviour: m_ObjectHideFlags: 3 @@ -133,6 +151,12 @@ MonoBehaviour: minSmoothness: m_OverrideState: 0 m_Value: 0.5 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounce: + m_OverrideState: 0 + m_Value: 3 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -170,8 +194,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -221,11 +251,17 @@ MonoBehaviour: m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 textureLodBias: m_OverrideState: 1 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionDenoised.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionDenoised.asset index 33de4d5601a..590d5807147 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionDenoised.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionDenoised.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: DiffusionProfileOverride m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 diffusionProfiles: m_OverrideState: 1 m_Value: @@ -31,7 +30,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 @@ -41,75 +39,62 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 radius: m_OverrideState: 0 m_Value: 2 - min: 0.25 - max: 5 + spatialBilateralAggressiveness: + m_OverrideState: 0 + m_Value: 0.15 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 + occluderMotionRejection: + m_OverrideState: 0 + m_Value: 1 + receiverMotionRejection: + m_OverrideState: 0 + m_Value: 1 m_StepCount: m_OverrideState: 0 m_Value: 6 - min: 2 - max: 32 m_FullResolution: m_OverrideState: 0 m_Value: 0 m_MaximumRadiusInPixels: m_OverrideState: 0 m_Value: 40 - min: 16 - max: 256 m_BilateralUpsample: m_OverrideState: 0 m_Value: 1 m_DirectionCount: m_OverrideState: 0 m_Value: 2 - min: 1 - max: 8 m_RayLength: m_OverrideState: 1 m_Value: 10 - min: 0 - max: 50 m_SampleCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 64 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 m_Value: 0.5 - min: 0.001 - max: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -140,13 +125,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -163,12 +156,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -178,11 +168,9 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.1886163 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.44019982, y: 0.4541125, z: 0.5} @@ -195,34 +183,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 21bb9ef0ab3fe414bacf326d4f1d8ee2, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -238,31 +227,21 @@ MonoBehaviour: 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 @@ -272,3 +251,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionNoisy.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionNoisy.asset index ca117bbdcb3..9c1fbedf73e 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionNoisy.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LargeAmbientOcclusionNoisy.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: DiffusionProfileOverride m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 diffusionProfiles: m_OverrideState: 1 m_Value: @@ -31,7 +30,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 @@ -41,75 +39,62 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 1 radius: m_OverrideState: 0 m_Value: 2 - min: 0.25 - max: 5 + spatialBilateralAggressiveness: + m_OverrideState: 0 + m_Value: 0.15 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 + occluderMotionRejection: + m_OverrideState: 0 + m_Value: 1 + receiverMotionRejection: + m_OverrideState: 0 + m_Value: 1 m_StepCount: m_OverrideState: 0 m_Value: 6 - min: 2 - max: 32 m_FullResolution: m_OverrideState: 0 m_Value: 0 m_MaximumRadiusInPixels: m_OverrideState: 0 m_Value: 40 - min: 16 - max: 256 m_BilateralUpsample: m_OverrideState: 0 m_Value: 1 m_DirectionCount: m_OverrideState: 0 m_Value: 2 - min: 1 - max: 8 m_RayLength: m_OverrideState: 1 m_Value: 10 - min: 0 - max: 50 m_SampleCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 64 m_Denoise: m_OverrideState: 1 m_Value: 0 m_DenoiserRadius: m_OverrideState: 1 m_Value: 1 - min: 0.001 - max: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -140,13 +125,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: m_OverrideState: 1 m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -163,12 +156,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -178,11 +168,9 @@ MonoBehaviour: multiplier: m_OverrideState: 1 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.1886163 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.44019982, y: 0.4541125, z: 0.5} @@ -195,34 +183,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 21bb9ef0ab3fe414bacf326d4f1d8ee2, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -238,31 +227,21 @@ MonoBehaviour: 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 @@ -272,3 +251,16 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbeintOcclusionDenoised.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbeintOcclusionDenoised.asset index 00f76f507aa..39f4aea7578 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbeintOcclusionDenoised.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbeintOcclusionDenoised.asset @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7506202601335527627 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0d7593b3a9277ac4696b20006c21dde2, type: 3} + m_Name: VisualEnvironment + m_EditorClassIdentifier: + active: 1 + skyType: + m_OverrideState: 0 + m_Value: 0 + cloudType: + m_OverrideState: 0 + m_Value: 0 + skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: + m_OverrideState: 0 + m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 + fogType: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14,6 +45,7 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: 4008086868137159810} + - {fileID: -7506202601335527627} --- !u!114 &4008086868137159810 MonoBehaviour: m_ObjectHideFlags: 3 @@ -27,7 +59,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 @@ -37,72 +68,59 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1.2 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 1 m_Value: 0 - min: 0 - max: 1 radius: m_OverrideState: 1 m_Value: 2 - min: 0.25 - max: 5 + spatialBilateralAggressiveness: + m_OverrideState: 0 + m_Value: 0.15 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 1 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + occluderMotionRejection: + m_OverrideState: 0 + m_Value: 1 + receiverMotionRejection: + m_OverrideState: 0 + m_Value: 1 m_StepCount: m_OverrideState: 1 m_Value: 6 - min: 2 - max: 32 m_FullResolution: m_OverrideState: 1 m_Value: 0 m_MaximumRadiusInPixels: m_OverrideState: 1 m_Value: 40 - min: 16 - max: 256 m_BilateralUpsample: m_OverrideState: 0 m_Value: 1 m_DirectionCount: m_OverrideState: 0 m_Value: 2 - min: 1 - max: 8 m_RayLength: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 50 m_SampleCount: m_OverrideState: 1 m_Value: 4 - min: 1 - max: 64 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 m_Value: 0.05 - min: 0.001 - max: 1 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbientOcclusionNoisy.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbientOcclusionNoisy.asset index d090fa99e34..b127ade44e2 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbientOcclusionNoisy.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/AmbientOcclusionData/LocalAmbientOcclusionNoisy.asset @@ -13,12 +13,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -28,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 2.4222004 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -45,34 +40,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 5fb993a599e7e9b4b825e1a28e6d2c07, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -88,31 +84,21 @@ MonoBehaviour: 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 @@ -122,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-1910636803690822243 MonoBehaviour: m_ObjectHideFlags: 3 @@ -135,7 +134,6 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 quality: m_OverrideState: 1 m_Value: 3 @@ -145,75 +143,62 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 - min: 0 - max: 4 directLightingStrength: m_OverrideState: 1 m_Value: 0.8 - min: 0 - max: 1 radius: m_OverrideState: 0 m_Value: 2 - min: 0.25 - max: 5 + spatialBilateralAggressiveness: + m_OverrideState: 0 + m_Value: 0.15 temporalAccumulation: m_OverrideState: 0 m_Value: 1 ghostingReduction: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 blurSharpness: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + occluderMotionRejection: + m_OverrideState: 0 + m_Value: 1 + receiverMotionRejection: + m_OverrideState: 0 + m_Value: 1 m_StepCount: m_OverrideState: 0 m_Value: 6 - min: 2 - max: 32 m_FullResolution: m_OverrideState: 0 m_Value: 0 m_MaximumRadiusInPixels: m_OverrideState: 0 m_Value: 40 - min: 16 - max: 256 m_BilateralUpsample: m_OverrideState: 0 m_Value: 1 m_DirectionCount: m_OverrideState: 0 m_Value: 2 - min: 1 - max: 6 m_RayLength: m_OverrideState: 1 m_Value: 0.2 - min: 0 - max: 50 m_SampleCount: m_OverrideState: 1 m_Value: 2 - min: 1 - max: 64 m_Denoise: m_OverrideState: 1 m_Value: 0 m_DenoiserRadius: m_OverrideState: 0 - m_Value: 16 - min: 1 - max: 32 + m_Value: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -242,14 +227,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d7593b3a9277ac4696b20006c21dde2, type: 3} m_Name: VisualEnvironment m_EditorClassIdentifier: - active: 0 - m_AdvancedMode: 0 + active: 1 skyType: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/Global Volume Profile.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/Global Volume Profile.asset index e1a900ad93c..33d0d3914d7 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/Global Volume Profile.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/LightClusterData/Global Volume Profile.asset @@ -16,7 +16,6 @@ MonoBehaviour: cameraClusterRange: m_OverrideState: 1 m_Value: 7 - min: 0.001 --- !u!114 &-5829422311057098105 MonoBehaviour: m_ObjectHideFlags: 3 @@ -42,13 +41,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 @@ -58,44 +53,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 1 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.001 m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 0 m_Value: 0 m_DenoiserRadius: m_OverrideState: 0 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -108,17 +100,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &-4774721187886003664 MonoBehaviour: m_ObjectHideFlags: 3 @@ -139,8 +126,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 @@ -160,8 +153,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -171,11 +162,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 4.1886163 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0.44019982, y: 0.4541125, z: 0.5} @@ -188,34 +177,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 21bb9ef0ab3fe414bacf326d4f1d8ee2, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -231,31 +221,21 @@ MonoBehaviour: 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 @@ -265,6 +245,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfFull.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfFull.asset index eb888817e77..d6b21115df9 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfFull.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfFull.asset @@ -16,8 +16,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -27,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -44,34 +40,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -87,31 +84,21 @@ MonoBehaviour: 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 @@ -121,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -213,7 +213,6 @@ MonoBehaviour: cameraClusterRange: m_OverrideState: 1 m_Value: 50 - min: 0.001 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -348,19 +347,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -385,7 +380,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &3564700782616824417 MonoBehaviour: m_ObjectHideFlags: 3 @@ -411,13 +405,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 @@ -427,44 +417,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 15.7 - min: 0.001 m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 0 m_Value: 0 m_DenoiserRadius: m_OverrideState: 0 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -477,17 +464,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -508,8 +490,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfHalf.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfHalf.asset index 60f8d4c2d26..a2f12d044f5 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfHalf.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsPerfHalf.asset @@ -16,8 +16,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -27,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -44,34 +40,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -87,31 +84,21 @@ MonoBehaviour: 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 @@ -121,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -213,7 +213,6 @@ MonoBehaviour: cameraClusterRange: m_OverrideState: 1 m_Value: 50 - min: 0.001 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -348,19 +347,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -385,7 +380,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &3564700782616824417 MonoBehaviour: m_ObjectHideFlags: 3 @@ -411,13 +405,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 @@ -427,44 +417,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 15.7 - min: 0.001 m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 0 m_Value: 0 m_DenoiserRadius: m_OverrideState: 0 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -477,17 +464,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -508,8 +490,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsQuality.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsQuality.asset index 64feba7217f..9161ee51bf6 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsQuality.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/RayTracedReflectionsQuality.asset @@ -16,8 +16,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -27,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -44,34 +40,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -87,31 +84,21 @@ MonoBehaviour: 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 @@ -121,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -213,7 +213,6 @@ MonoBehaviour: cameraClusterRange: m_OverrideState: 1 m_Value: 50 - min: 0.001 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -348,19 +347,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -385,7 +380,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &3564700782616824417 MonoBehaviour: m_ObjectHideFlags: 3 @@ -411,13 +405,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 @@ -427,44 +417,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Bits: 4294967295 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.001 m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 1 m_Value: 0 m_DenoiserRadius: m_OverrideState: 0 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -477,17 +464,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 1 m_Value: 2 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -508,8 +490,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/ReflectionsAndGlobalIlluminationCollision.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/ReflectionsAndGlobalIlluminationCollision.asset index 3ebab1f4d53..7a054597b5f 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/ReflectionsAndGlobalIlluminationCollision.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RayTracedReflectionsData/ReflectionsAndGlobalIlluminationCollision.asset @@ -20,7 +20,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 @@ -197,6 +197,9 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 + fullResolutionSS: + m_OverrideState: 0 + m_Value: 1 m_MaxRaySteps: m_OverrideState: 0 m_Value: 32 @@ -315,7 +318,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 textureLodBias: m_OverrideState: 0 m_Value: 1 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/RayTracedReflectionsQuality_Indirect.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/RayTracedReflectionsQuality_Indirect.asset index 77c48d90496..e69f9572909 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/RayTracedReflectionsQuality_Indirect.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/Indirect/RayTracedReflectionsQuality_Indirect.asset @@ -16,8 +16,6 @@ MonoBehaviour: rotation: m_OverrideState: 0 m_Value: 0 - min: 0 - max: 360 skyIntensityMode: m_OverrideState: 0 m_Value: 0 @@ -27,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -44,34 +40,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -87,31 +84,21 @@ MonoBehaviour: 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 @@ -121,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -219,56 +219,59 @@ MonoBehaviour: tracing: m_OverrideState: 1 m_Value: 2 + rayMiss: + m_OverrideState: 0 + m_Value: 3 depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 - m_RaySteps: + fullResolutionSS: m_OverrideState: 0 - m_Value: 64 - min: 16 - max: 128 - m_FilterRadius: + m_Value: 1 + m_MaxRaySteps: m_OverrideState: 0 - m_Value: 8 - min: 2 - max: 8 + m_Value: 32 + m_DenoiseSS: + m_OverrideState: 0 + m_Value: 1 + m_HalfResolutionDenoiserSS: + m_OverrideState: 0 + m_Value: 0 + m_DenoiserRadiusSS: + m_OverrideState: 0 + m_Value: 0.6 + m_SecondDenoiserPassSS: + m_OverrideState: 0 + m_Value: 1 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + textureLodBias: + m_OverrideState: 0 + m_Value: 7 m_RayLength: m_OverrideState: 0 m_Value: 50 - min: 0 m_ClampValue: m_OverrideState: 0 m_Value: 0.8 - min: 0.001 - max: 10 mode: m_OverrideState: 0 m_Value: 2 m_FullResolution: m_OverrideState: 0 m_Value: 0 - m_UpscaleRadius: - m_OverrideState: 0 - m_Value: 4 - min: 2 - max: 4 sampleCount: m_OverrideState: 0 m_Value: 2 - min: 1 - max: 32 bounceCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 31 m_Denoise: m_OverrideState: 0 m_Value: 1 @@ -278,16 +281,15 @@ MonoBehaviour: m_DenoiserRadius: m_OverrideState: 0 m_Value: 0.5 - min: 0.001 - max: 1 m_SecondDenoiserPass: m_OverrideState: 0 m_Value: 1 - m_RayStepsRT: + m_MaxMixedRaySteps: m_OverrideState: 0 m_Value: 48 - min: 16 - max: 128 + receiverMotionRejection: + m_OverrideState: 0 + m_Value: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -422,19 +424,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -459,7 +457,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &3564700782616824417 MonoBehaviour: m_ObjectHideFlags: 3 @@ -485,13 +482,9 @@ MonoBehaviour: m_MinSmoothness: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 m_SmoothnessFadeStart: m_OverrideState: 0 m_Value: 0.9 - min: 0 - max: 1 reflectSky: m_OverrideState: 0 m_Value: 1 @@ -501,44 +494,41 @@ MonoBehaviour: depthBufferThickness: m_OverrideState: 0 m_Value: 0.01 - min: 0 - max: 1 screenFadeDistance: m_OverrideState: 0 m_Value: 0.1 - min: 0 - max: 1 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 - min: 0 - max: 1 m_RayMaxIterations: m_OverrideState: 0 m_Value: 32 - min: 0 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounceFallbackHierarchy: + m_OverrideState: 0 + m_Value: 3 layerMask: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 + textureLodBias: + m_OverrideState: 0 + m_Value: 1 m_RayLength: m_OverrideState: 1 m_Value: 50 - min: 0.001 m_ClampValue: m_OverrideState: 0 m_Value: 1 - min: 0.001 - max: 10 m_Denoise: m_OverrideState: 1 m_Value: 0 m_DenoiserRadius: m_OverrideState: 0 m_Value: 16 - min: 1 - max: 32 m_AffectSmoothSurfaces: m_OverrideState: 0 m_Value: 0 @@ -551,17 +541,12 @@ MonoBehaviour: sampleCount: m_OverrideState: 0 m_Value: 1 - min: 1 - max: 32 bounceCount: m_OverrideState: 1 m_Value: 2 - min: 1 - max: 31 m_RayMaxIterationsRT: m_OverrideState: 0 m_Value: 32 - min: 0 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -582,8 +567,14 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/RayTracedReflectionsQuality_Untouched.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/RayTracedReflectionsQuality_Untouched.asset index 98fc1d4cda8..7230a6ff0bf 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/RayTracedReflectionsQuality_Untouched.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/RaytracingQualityKeyword/RecursiveRendering/RayTracedReflectionsQuality_Untouched.asset @@ -13,12 +13,9 @@ MonoBehaviour: m_Name: HDRISky 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 @@ -28,11 +25,9 @@ MonoBehaviour: multiplier: m_OverrideState: 0 m_Value: 1 - min: 0 upperHemisphereLuxValue: m_OverrideState: 0 m_Value: 0 - min: 0 upperHemisphereLuxColor: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} @@ -45,34 +40,35 @@ MonoBehaviour: updatePeriod: m_OverrideState: 0 m_Value: 0 - min: 0 includeSunInBaking: m_OverrideState: 0 m_Value: 0 hdriSky: m_OverrideState: 1 m_Value: {fileID: 8900000, guid: 75f8ba90acb52d14d9ead53b2a9e4190, type: 3} - enableDistortion: + distortionMode: m_OverrideState: 0 m_Value: 0 - procedural: - m_OverrideState: 0 - m_Value: 1 flowmap: m_OverrideState: 0 m_Value: {fileID: 0} upperHemisphereOnly: m_OverrideState: 0 m_Value: 1 - scrollDirection: + scrollOrientation: m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 + m_Value: + mode: 1 + customValue: 0 + additiveValue: 0 + multiplyValue: 1 scrollSpeed: m_OverrideState: 0 - m_Value: 2 - min: 0 + m_Value: + mode: 1 + customValue: 100 + additiveValue: 0 + multiplyValue: 1 enableBackplate: m_OverrideState: 0 m_Value: 0 @@ -88,31 +84,21 @@ MonoBehaviour: 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 @@ -122,6 +108,19 @@ MonoBehaviour: rectLightShadow: m_OverrideState: 0 m_Value: 0 + m_SkyVersion: 1 + enableDistortion: + m_OverrideState: 0 + m_Value: 0 + procedural: + m_OverrideState: 0 + m_Value: 1 + scrollDirection: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteScrollSpeed: + m_OverrideState: 0 + m_Value: 2 --- !u!114 &-5988877546997805337 MonoBehaviour: m_ObjectHideFlags: 3 @@ -226,7 +225,6 @@ MonoBehaviour: m_Name: Exposure m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 mode: m_OverrideState: 0 m_Value: 0 @@ -332,19 +330,15 @@ MonoBehaviour: adaptationSpeedDarkToLight: m_OverrideState: 0 m_Value: 3 - min: 0.001 adaptationSpeedLightToDark: m_OverrideState: 0 m_Value: 1 - min: 0.001 weightTextureMask: m_OverrideState: 0 m_Value: {fileID: 0} histogramPercentages: m_OverrideState: 0 m_Value: {x: 40, y: 90} - min: 0 - max: 100 histogramUseCurveRemapping: m_OverrideState: 0 m_Value: 0 @@ -369,7 +363,6 @@ MonoBehaviour: proceduralSoftness: m_OverrideState: 0 m_Value: 0.5 - min: 0 --- !u!114 &7829236065204354697 MonoBehaviour: m_ObjectHideFlags: 3 @@ -383,7 +376,6 @@ MonoBehaviour: m_Name: RecursiveRendering m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 enable: m_OverrideState: 1 m_Value: 1 @@ -391,22 +383,22 @@ MonoBehaviour: m_OverrideState: 0 m_Value: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1847 maxDepth: m_OverrideState: 0 m_Value: 4 - min: 1 - max: 10 rayLength: m_OverrideState: 0 m_Value: 10 - min: 0 - max: 50 minSmoothness: m_OverrideState: 0 m_Value: 0.5 - min: 0 - max: 1 + rayMiss: + m_OverrideState: 0 + m_Value: 3 + lastBounce: + m_OverrideState: 0 + m_Value: 3 --- !u!114 &8436036751141806562 MonoBehaviour: m_ObjectHideFlags: 3 @@ -420,13 +412,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 + cloudType: + m_OverrideState: 0 + m_Value: 0 skyAmbientMode: + m_OverrideState: 1 + m_Value: 0 + windOrientation: m_OverrideState: 0 m_Value: 0 + windSpeed: + m_OverrideState: 0 + m_Value: 100 fogType: m_OverrideState: 0 m_Value: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Both.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Both.asset index e402992c3f6..185166558dc 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Both.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Both.asset @@ -247,7 +247,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_None.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_None.asset index 691d139a402..432cee6b7c0 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_None.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_None.asset @@ -247,7 +247,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Probe.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Probe.asset index dffe4ab1c24..c78c6142520 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Probe.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Probe.asset @@ -247,7 +247,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Sky.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Sky.asset index c97ef4ea704..e5b53450c55 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Sky.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_LastBounce_Fallback/Reflection_LastBounce_Fallback_Sky.asset @@ -247,7 +247,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackBoth.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackBoth.asset index 00f24bf4657..f1f80dd090b 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackBoth.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackBoth.asset @@ -231,7 +231,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackNone.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackNone.asset index d30cbd49cba..7a648761078 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackNone.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackNone.asset @@ -141,7 +141,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackProbe.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackProbe.asset index 21f0c433d67..0a0da58a3c6 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackProbe.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackProbe.asset @@ -231,7 +231,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackSky.asset b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackSky.asset index ce67d82dfb5..1047de67e1c 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackSky.asset +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/Reflection_RayMiss_Fallback/Reflection_RayMiss_FallbackSky.asset @@ -20,7 +20,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0 skyAmbientMode: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0 windOrientation: m_OverrideState: 0 From f1c8e68e73049a31e60dfa235fc373871f7dd420 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:18 +0000 Subject: [PATCH 030/149] [CI] [trunk] Updated editor to 913622cc2e276a16bd835cd653ccd7ff9181a8af --- .yamato/_latest_editor_versions_trunk.metafile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 736a02b28e2..f74d270ed20 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: - updated_at_UTC: '2021-08-31 00:01:09.181316' + updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: c277161121c634a9e605c7161b641c7f935eada5 - date: '2021-08-31T01:52:27' + id: 913622cc2e276a16bd835cd653ccd7ff9181a8af + date: '2021-09-02T03:42:55' From 16bf74ac1306454069f3258558f7dd85e381b91c Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:20 +0000 Subject: [PATCH 031/149] [CI] [trunk] Updated editor to 74a298ce857c7aa398c7aede4671147ff8306043 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index f74d270ed20..599acb2140c 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 913622cc2e276a16bd835cd653ccd7ff9181a8af - date: '2021-09-02T03:42:55' + id: 74a298ce857c7aa398c7aede4671147ff8306043 + date: '2021-09-02T03:44:33' From 42e5ea4612dd9ed8e0a02009396bfbb25f9f7713 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:21 +0000 Subject: [PATCH 032/149] [CI] [trunk] Updated editor to 4ddf1217108973de5838195a08ad0afa16718cc0 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 599acb2140c..3fb5d31dcfc 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 74a298ce857c7aa398c7aede4671147ff8306043 - date: '2021-09-02T03:44:33' + id: 4ddf1217108973de5838195a08ad0afa16718cc0 + date: '2021-09-02T03:45:12' From e28ed287c0bbb8ddecbd9e709527b7548d0f29e4 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:22 +0000 Subject: [PATCH 033/149] [CI] [trunk] Updated editor to 75017bc539fba8855273f7a13a2c4d01cad95a0e --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 3fb5d31dcfc..3a5afd919a0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 4ddf1217108973de5838195a08ad0afa16718cc0 - date: '2021-09-02T03:45:12' + id: 75017bc539fba8855273f7a13a2c4d01cad95a0e + date: '2021-09-02T03:46:37' From 1bab7beca8b7ec6084e6574a15a12c5d685a3ec2 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:23 +0000 Subject: [PATCH 034/149] [CI] [trunk] Updated editor to e5dcdba031ea6970fc8366bde5a08ec862434de4 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 3a5afd919a0..2337ac41c26 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 75017bc539fba8855273f7a13a2c4d01cad95a0e - date: '2021-09-02T03:46:37' + id: e5dcdba031ea6970fc8366bde5a08ec862434de4 + date: '2021-09-02T03:47:26' From f631e311161fcdd3f50bb49ba6a287dce9475987 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:24 +0000 Subject: [PATCH 035/149] [CI] [trunk] Updated editor to 632b8ce2e40e5567b13561f595c3bffae6bb2e9b --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 2337ac41c26..c21958fbe1b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: e5dcdba031ea6970fc8366bde5a08ec862434de4 - date: '2021-09-02T03:47:26' + id: 632b8ce2e40e5567b13561f595c3bffae6bb2e9b + date: '2021-09-02T03:48:48' From af90c32a99635452626e9cab7dc621e350f7cf41 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:26 +0000 Subject: [PATCH 036/149] [CI] [trunk] Updated editor to 9611dd34158a25aafea00c091a5d182c6e17bf38 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index c21958fbe1b..603e54e2813 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 632b8ce2e40e5567b13561f595c3bffae6bb2e9b - date: '2021-09-02T03:48:48' + id: 9611dd34158a25aafea00c091a5d182c6e17bf38 + date: '2021-09-02T03:57:37' From f1273cae2692ec4462cc39e525152fd0cac68858 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:27 +0000 Subject: [PATCH 037/149] [CI] [trunk] Updated editor to a22ad3487dc710bafd073abf9a7cf55ebcff1962 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 603e54e2813..d50891cc21d 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 9611dd34158a25aafea00c091a5d182c6e17bf38 - date: '2021-09-02T03:57:37' + id: a22ad3487dc710bafd073abf9a7cf55ebcff1962 + date: '2021-09-02T03:58:18' From eb49811e170f8d30ebc6bad664fbe9dc16409b85 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:28 +0000 Subject: [PATCH 038/149] [CI] [trunk] Updated editor to c81a91ef6c0e4044bda2c51d00541ff116ef1544 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d50891cc21d..5619337a5a6 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: a22ad3487dc710bafd073abf9a7cf55ebcff1962 - date: '2021-09-02T03:58:18' + id: c81a91ef6c0e4044bda2c51d00541ff116ef1544 + date: '2021-09-02T04:00:07' From 90c23268f99243c425177c23a355c12033e1663c Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:29 +0000 Subject: [PATCH 039/149] [CI] [trunk] Updated editor to 43960bbf8cb8ab3200df5be7374472400387fb7c --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 5619337a5a6..fd7921f7cf0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: c81a91ef6c0e4044bda2c51d00541ff116ef1544 - date: '2021-09-02T04:00:07' + id: 43960bbf8cb8ab3200df5be7374472400387fb7c + date: '2021-09-02T04:00:44' From 0ca071a84d9976ac0c12dbdacd75ad619486f557 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:30 +0000 Subject: [PATCH 040/149] [CI] [trunk] Updated editor to 10d6611deb654c9d1c51ee79a2af0fee13af17b6 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index fd7921f7cf0..615ffb5905b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 43960bbf8cb8ab3200df5be7374472400387fb7c - date: '2021-09-02T04:00:44' + id: 10d6611deb654c9d1c51ee79a2af0fee13af17b6 + date: '2021-09-02T04:02:18' From 950069e69e73591f50e5aa6a72f03fcd261d4864 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:31 +0000 Subject: [PATCH 041/149] [CI] [trunk] Updated editor to 39d8f240087500d1cb7469a971156ec39502cf33 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 615ffb5905b..4a115b51445 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 10d6611deb654c9d1c51ee79a2af0fee13af17b6 - date: '2021-09-02T04:02:18' + id: 39d8f240087500d1cb7469a971156ec39502cf33 + date: '2021-09-02T04:02:44' From 45fe67e2dd989e1ef24d6fc153f4db6c6ae51bb6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:32 +0000 Subject: [PATCH 042/149] [CI] [trunk] Updated editor to 403271a24b41739e408263fddfa79679c2df87d0 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 4a115b51445..86e682551d3 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 39d8f240087500d1cb7469a971156ec39502cf33 - date: '2021-09-02T04:02:44' + id: 403271a24b41739e408263fddfa79679c2df87d0 + date: '2021-09-02T04:03:20' From 25200fa262bfe6c85ba1be12cce19ae10fb30211 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:34 +0000 Subject: [PATCH 043/149] [CI] [trunk] Updated editor to b4e405e9ab6d73636eb25bea6371bc18122849d6 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 86e682551d3..bef19b0a60b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 403271a24b41739e408263fddfa79679c2df87d0 - date: '2021-09-02T04:03:20' + id: b4e405e9ab6d73636eb25bea6371bc18122849d6 + date: '2021-09-02T04:04:42' From ab897c9fc73f95aec390d4287b9041270068e3c2 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:35 +0000 Subject: [PATCH 044/149] [CI] [trunk] Updated editor to 28383b2840793e6dea0fb060ddfef44e0be79b25 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index bef19b0a60b..aa734ce616b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: b4e405e9ab6d73636eb25bea6371bc18122849d6 - date: '2021-09-02T04:04:42' + id: 28383b2840793e6dea0fb060ddfef44e0be79b25 + date: '2021-09-02T04:06:09' From 556a211eb5890574bcd0accfc2a285c3a50b25bc Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:36 +0000 Subject: [PATCH 045/149] [CI] [trunk] Updated editor to dd6c47dcf7df8499930e0b202c87901fbb28cf5c --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index aa734ce616b..212643c98f5 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 28383b2840793e6dea0fb060ddfef44e0be79b25 - date: '2021-09-02T04:06:09' + id: dd6c47dcf7df8499930e0b202c87901fbb28cf5c + date: '2021-09-02T04:06:48' From 332284807525df7abe74b284abcf079c421bf95b Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:37 +0000 Subject: [PATCH 046/149] [CI] [trunk] Updated editor to c949e3921a68020a31993fc5373c768fb929664d --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 212643c98f5..85777f523b5 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: dd6c47dcf7df8499930e0b202c87901fbb28cf5c - date: '2021-09-02T04:06:48' + id: c949e3921a68020a31993fc5373c768fb929664d + date: '2021-09-02T04:08:12' From 63d930d038e1ccb0c3e30e13ff8ecf7e11f7b1f2 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:38 +0000 Subject: [PATCH 047/149] [CI] [trunk] Updated editor to e4e86749ab65053fd26a43230982de5fbeb2ede8 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 85777f523b5..a07831051f9 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: c949e3921a68020a31993fc5373c768fb929664d - date: '2021-09-02T04:08:12' + id: e4e86749ab65053fd26a43230982de5fbeb2ede8 + date: '2021-09-02T04:12:17' From 90aada7b92b22d612cbce021ebd5d9f0337b72a6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:39 +0000 Subject: [PATCH 048/149] [CI] [trunk] Updated editor to 2e9c045056b1deacaf42a4d9fec6a39a84ee4e9c --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index a07831051f9..42083d2abe5 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: e4e86749ab65053fd26a43230982de5fbeb2ede8 - date: '2021-09-02T04:12:17' + id: 2e9c045056b1deacaf42a4d9fec6a39a84ee4e9c + date: '2021-09-02T04:12:46' From fbf2f05b4bfc4dd79e51ebdd0e8629776854b1e0 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:41 +0000 Subject: [PATCH 049/149] [CI] [trunk] Updated editor to d3101cf4f9dd583fbffa77c72e2b8fe85e3f1d31 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 42083d2abe5..f0494f2f56e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 2e9c045056b1deacaf42a4d9fec6a39a84ee4e9c - date: '2021-09-02T04:12:46' + id: d3101cf4f9dd583fbffa77c72e2b8fe85e3f1d31 + date: '2021-09-02T04:14:33' From 611edc8644576cd1bc83659ff78c8635f054bd71 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:42 +0000 Subject: [PATCH 050/149] [CI] [trunk] Updated editor to 7f5596b680a0186e3e2fabe8bfe245a3d260a851 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index f0494f2f56e..a7fe2f356e4 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: d3101cf4f9dd583fbffa77c72e2b8fe85e3f1d31 - date: '2021-09-02T04:14:33' + id: 7f5596b680a0186e3e2fabe8bfe245a3d260a851 + date: '2021-09-02T04:15:04' From 64abedd6e6028163d0e35e8867a69e32f63d86ee Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:43 +0000 Subject: [PATCH 051/149] [CI] [trunk] Updated editor to 8d8c0fd9c033b609f0bdf7418d901cb1de87857e --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index a7fe2f356e4..f79768d4775 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 7f5596b680a0186e3e2fabe8bfe245a3d260a851 - date: '2021-09-02T04:15:04' + id: 8d8c0fd9c033b609f0bdf7418d901cb1de87857e + date: '2021-09-02T04:15:30' From 6d2239ac3755562b5c21986834edc731664684f5 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:44 +0000 Subject: [PATCH 052/149] [CI] [trunk] Updated editor to 9851c6f9ecd02e2903ed00f26708a8ae3f0a4076 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index f79768d4775..143c7694161 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 8d8c0fd9c033b609f0bdf7418d901cb1de87857e - date: '2021-09-02T04:15:30' + id: 9851c6f9ecd02e2903ed00f26708a8ae3f0a4076 + date: '2021-09-02T04:16:07' From 558b3708290cf8b3646f6327de97587a3516597e Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:45 +0000 Subject: [PATCH 053/149] [CI] [trunk] Updated editor to b2248e110351bb75d23e1ddbb613ccac2218bf66 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 143c7694161..af8ade57721 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 9851c6f9ecd02e2903ed00f26708a8ae3f0a4076 - date: '2021-09-02T04:16:07' + id: b2248e110351bb75d23e1ddbb613ccac2218bf66 + date: '2021-09-02T04:17:38' From 0db1eccc00c6b24ccfbd828d572dd7a6826d93f3 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:46 +0000 Subject: [PATCH 054/149] [CI] [trunk] Updated editor to 0200167d488ec8e2857958eb00340ebec61a3826 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index af8ade57721..d796160e276 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: b2248e110351bb75d23e1ddbb613ccac2218bf66 - date: '2021-09-02T04:17:38' + id: 0200167d488ec8e2857958eb00340ebec61a3826 + date: '2021-09-02T04:19:01' From 9a889118aba58605e6e8a113019df3d173ba4b1e Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:48 +0000 Subject: [PATCH 055/149] [CI] [trunk] Updated editor to aaae12b8fe9cc04c55e1e6920f3d6edcbab975c4 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d796160e276..1da716fef7c 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 0200167d488ec8e2857958eb00340ebec61a3826 - date: '2021-09-02T04:19:01' + id: aaae12b8fe9cc04c55e1e6920f3d6edcbab975c4 + date: '2021-09-02T04:20:55' From 38c48e693e349487c44dc2253ec4ad09ad7fec42 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:49 +0000 Subject: [PATCH 056/149] [CI] [trunk] Updated editor to 2ed7b37acc9d3ca0ca5e9ae983d05678b3500fa4 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 1da716fef7c..c82219936c5 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: aaae12b8fe9cc04c55e1e6920f3d6edcbab975c4 - date: '2021-09-02T04:20:55' + id: 2ed7b37acc9d3ca0ca5e9ae983d05678b3500fa4 + date: '2021-09-02T04:22:23' From 737d22803a6ba9e5d79668374f7b0af756a1e300 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:50 +0000 Subject: [PATCH 057/149] [CI] [trunk] Updated editor to 7698b5df2a77aafde2c256aaa838a3ee6ad24320 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index c82219936c5..b2f245f2a06 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 2ed7b37acc9d3ca0ca5e9ae983d05678b3500fa4 - date: '2021-09-02T04:22:23' + id: 7698b5df2a77aafde2c256aaa838a3ee6ad24320 + date: '2021-09-02T04:22:59' From 59e74479d7a1749b779877f2e52157b2722507cf Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:51 +0000 Subject: [PATCH 058/149] [CI] [trunk] Updated editor to 4b58f672e8f00a63051e7477d5c959edec066906 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index b2f245f2a06..5f96c0001e1 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 7698b5df2a77aafde2c256aaa838a3ee6ad24320 - date: '2021-09-02T04:22:59' + id: 4b58f672e8f00a63051e7477d5c959edec066906 + date: '2021-09-02T04:24:40' From 5853fc6b696e28ae38ec2977ba4600f5077e2a7d Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:52 +0000 Subject: [PATCH 059/149] [CI] [trunk] Updated editor to 10ec309917de46ad34ab466064ca65f06c18e3ab --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 5f96c0001e1..680de0bae68 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 4b58f672e8f00a63051e7477d5c959edec066906 - date: '2021-09-02T04:24:40' + id: 10ec309917de46ad34ab466064ca65f06c18e3ab + date: '2021-09-02T04:26:36' From 720bc09d47aff32dcf7fe47ea06c00ff302f2d62 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:53 +0000 Subject: [PATCH 060/149] [CI] [trunk] Updated editor to 0d18c0616464212f7e264714a250afd2931af124 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 680de0bae68..46dbf1045cd 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 10ec309917de46ad34ab466064ca65f06c18e3ab - date: '2021-09-02T04:26:36' + id: 0d18c0616464212f7e264714a250afd2931af124 + date: '2021-09-02T04:27:01' From 184e9c805b219d0e7c4de69ab2dd5a9f2c1a81b9 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:55 +0000 Subject: [PATCH 061/149] [CI] [trunk] Updated editor to 93eba1ca825b6dc527678eb644ef45ef3f782675 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 46dbf1045cd..2603d9a1e7b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 0d18c0616464212f7e264714a250afd2931af124 - date: '2021-09-02T04:27:01' + id: 93eba1ca825b6dc527678eb644ef45ef3f782675 + date: '2021-09-02T04:27:28' From 30473bab89d6ce83f6f9cd2c642e040e30dfce16 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:56 +0000 Subject: [PATCH 062/149] [CI] [trunk] Updated editor to df0356bc39da910fce5dbea6df7c1be3753c1b3b --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 2603d9a1e7b..05894f66707 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 93eba1ca825b6dc527678eb644ef45ef3f782675 - date: '2021-09-02T04:27:28' + id: df0356bc39da910fce5dbea6df7c1be3753c1b3b + date: '2021-09-02T04:28:02' From 68c331f4f4d657a359148b90f1d60e5f6a6a3ff2 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:57 +0000 Subject: [PATCH 063/149] [CI] [trunk] Updated editor to 123b7174c1f7329d7420d1924dc725dc57d6b079 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 05894f66707..fcdd7c24d02 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: df0356bc39da910fce5dbea6df7c1be3753c1b3b - date: '2021-09-02T04:28:02' + id: 123b7174c1f7329d7420d1924dc725dc57d6b079 + date: '2021-09-02T04:28:30' From 8b94a3412eccd2de2816cc3c950fa5ffdd5b1389 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:58 +0000 Subject: [PATCH 064/149] [CI] [trunk] Updated editor to 57a32acdf7faae23477083eeb97d4231621aef68 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index fcdd7c24d02..ccacfabfb59 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 123b7174c1f7329d7420d1924dc725dc57d6b079 - date: '2021-09-02T04:28:30' + id: 57a32acdf7faae23477083eeb97d4231621aef68 + date: '2021-09-02T04:29:59' From 573943a20c888fac47efdf767033b3f0158bd3d6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:32:59 +0000 Subject: [PATCH 065/149] [CI] [trunk] Updated editor to 0af1bca61d55fca608e9aa4829781f90e4b99198 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index ccacfabfb59..b8cd886398a 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 57a32acdf7faae23477083eeb97d4231621aef68 - date: '2021-09-02T04:29:59' + id: 0af1bca61d55fca608e9aa4829781f90e4b99198 + date: '2021-09-02T04:30:24' From fe68162d0aa1d242329644b93068471fc6a47f95 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:33:01 +0000 Subject: [PATCH 066/149] [CI] [trunk] Updated editor to 52e80568b9b36ebfdf175232f3a2a108bbf34a05 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index b8cd886398a..5428b429e99 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 0af1bca61d55fca608e9aa4829781f90e4b99198 - date: '2021-09-02T04:30:24' + id: 52e80568b9b36ebfdf175232f3a2a108bbf34a05 + date: '2021-09-02T04:32:04' From cf7ea4ddff195931c1fc072de7aeab8ddeb8c8d4 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:33:02 +0000 Subject: [PATCH 067/149] [CI] [trunk] Updated editor to e51cf6542abafade20ceba9b986aab51a2973007 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 5428b429e99..51fe943fd7e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: 52e80568b9b36ebfdf175232f3a2a108bbf34a05 - date: '2021-09-02T04:32:04' + id: e51cf6542abafade20ceba9b986aab51a2973007 + date: '2021-09-02T04:33:55' From 35d23455597fb62673a2fa324aeff687f63e2b5e Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:33:03 +0000 Subject: [PATCH 068/149] [CI] [trunk] Updated editor to f88f6e0a796a902d15aaec436fadf631bd753a59 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 51fe943fd7e..3a0b3288b71 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: e51cf6542abafade20ceba9b986aab51a2973007 - date: '2021-09-02T04:33:55' + id: f88f6e0a796a902d15aaec436fadf631bd753a59 + date: '2021-09-02T04:34:30' From 27fb36e1d7aa81355422ab95b831797ea4bd6094 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Thu, 2 Sep 2021 23:33:04 +0000 Subject: [PATCH 069/149] [CI] [trunk] Updated editor to 234483c68112af95f376bc5820685039f46541f2 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 3a0b3288b71..106fb5c9519 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-02 23:32:10.094863' changeset: - id: f88f6e0a796a902d15aaec436fadf631bd753a59 - date: '2021-09-02T04:34:30' + id: 234483c68112af95f376bc5820685039f46541f2 + date: '2021-09-02T04:35:04' From 376e1520c433de56e4bdf278a4e97d42a3893a17 Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Fri, 3 Sep 2021 09:41:59 +0200 Subject: [PATCH 070/149] Fix formatting --- .../Documentation~/Override-Screen-Space-GI.md | 4 ++-- .../RenderPipeline/Raytracing/GlobalIlluminationEditor.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md index 5656481a28b..5f4eaf808ef 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md @@ -74,8 +74,8 @@ HDRP uses the [Volume](Volumes.md) framework to calculate SSGI, so to enable and ## Limitations -In Deferred rendering mode, Screen Space Global Illumination and Ray-Traced Global Illumination share a buffer with emissive, which overwrites emissive data. -There are multiple ways to recover the emissive contribution of the scene materials: +In Deferred rendering mode, Screen Space Global Illumination and Ray-Traced Global Illumination share a buffer with emissive, which overwrites emissive data. +There are multiple ways to recover the emissive contribution of the scene materials: * Disable [Receive SSR/SSGI](snippets/shader-properties/surface-options/receive-ssr.md) flag on the emissive materials. * Use [Force Forward Emissive](snippets/shader-properties/advanced-options/force-forward-emissive.md) on the emissive materials. * Use Forward rendering. diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs index f8352fb003e..45d5933e9f1 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs @@ -173,10 +173,10 @@ public override void OnInspectorGUI() } PropertyField(m_Enable); - if (m_Enable.value.boolValue) - EditorGUILayout.HelpBox("Real-time Global Illumination overwrites emissive data in deferred rendering mode. To recover the emissive contribution, either use Force Forward Emissive or disable Receive SSR/SSGI flag on the emissive materials.", MessageType.Info); + if (m_Enable.value.boolValue) + EditorGUILayout.HelpBox("Real-time Global Illumination overwrites emissive data in deferred rendering mode. To recover the emissive contribution, either use Force Forward Emissive or disable Receive SSR/SSGI flag on the emissive materials.", MessageType.Info); EditorGUILayout.Space(); - + // If ray tracing is supported display the content of the volume component if (HDRenderPipeline.buildPipelineSupportsRayTracing) PropertyField(m_Tracing); From 22574185f58c1e9baeb3c12513aba4ad597f5942 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Fri, 3 Sep 2021 09:52:13 +0200 Subject: [PATCH 071/149] New APV workflow backend to remove need for ProbeReferenceVolume component from user side (#5511) * Create hidden per scene data * Start using new mode in baking workflow (Need to fix the tmp send data) * Remove loading/removal from authoring * Need to switch branch, move profile data to asset * Almost completely get rid of baking reference volume * remove baking ref from realtime subdiv (but not working :p) * Revert "remove baking ref from realtime subdiv (but not working :p)" This reverts commit a92bf42828dca7176c0342ce922f5a051ab10424. * Remove all probe ref volume authroing from baking, yay! * Moving draw gizmo away and remove all reference of authoring from baking * Make sure baking profile is available if required during non baking * Load profile info from the asset * Fix dilation refresh * remove some other things * remove asset * Small rename * Move field inside EDITOR tags * Fix issue when no profile is ever loaded (i.e. first time a project is loaded) * guards --- .../Lighting/ProbeVolume/ProbeGIBaking.cs | 238 ++++++++---------- .../Lighting/ProbeVolume/ProbePlacement.cs | 4 +- .../ProbeReferenceVolumeAuthoringEditor.cs | 117 --------- .../ProbeVolume/ProbeSubdivisionContext.cs | 125 ++++++++- .../ProbeVolume/ProbeReferenceVolume.Debug.cs | 3 + .../ProbeVolume/ProbeReferenceVolume.cs | 15 +- .../ProbeReferenceVolumeAuthoring.cs | 218 ++-------------- .../Lighting/ProbeVolume/ProbeVolume.cs | 175 ++++++++++++- .../Lighting/ProbeVolume/ProbeVolumeAsset.cs | 15 ++ .../ProbeVolumeBakingProcessSettings.cs | 14 ++ ... ProbeVolumeBakingProcessSettings.cs.meta} | 2 +- .../ProbeVolume/ProbeVolumePerSceneData.cs | 144 +++++++++++ .../ProbeVolumePerSceneData.cs.meta | 11 + ...SceneBounds.cs => ProbeVolumeSceneData.cs} | 170 ++++++++++++- .../ProbeVolume/ProbeVolumeSceneData.cs.meta | 11 + ...erializedHDRenderPipelineGlobalSettings.cs | 4 +- .../RenderPipeline/HDRenderPipeline.cs | 2 +- .../HDRenderPipelineGlobalSettings.cs | 12 +- 18 files changed, 804 insertions(+), 476 deletions(-) create mode 100644 com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs rename com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/{ProbeVolumeSceneBounds.cs.meta => ProbeVolumeBakingProcessSettings.cs.meta} (83%) create mode 100644 com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs create mode 100644 com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta rename com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/{ProbeVolumeSceneBounds.cs => ProbeVolumeSceneData.cs} (58%) create mode 100644 com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs index 40be8e48745..b1391b4d6fb 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs @@ -51,7 +51,9 @@ partial class ProbeGIBaking { static bool m_IsInit = false; static BakingBatch m_BakingBatch; - static ProbeReferenceVolumeAuthoring m_BakingReferenceVolumeAuthoring = null; + static ProbeReferenceVolumeProfile m_BakingProfile = null; + static ProbeVolumeBakingProcessSettings m_BakingSettings; + static int m_BakingBatchIndex = 0; static Bounds globalBounds = new Bounds(); @@ -84,19 +86,12 @@ static void ClearBakingBatch() static public void Clear() { - var refVolAuthList = GameObject.FindObjectsOfType(); - - foreach (var refVolAuthoring in refVolAuthList) + var perSceneData = GameObject.FindObjectsOfType(); + foreach (var data in perSceneData) { - if (!refVolAuthoring.enabled || !refVolAuthoring.gameObject.activeSelf) - continue; - - refVolAuthoring.volumeAsset = null; - + data.InvalidateAllAssets(); var refVol = ProbeReferenceVolume.instance; refVol.Clear(); - refVol.SetTRS(Vector3.zero, Quaternion.identity, refVolAuthoring.brickSize); - refVol.SetMaxSubdivision(refVolAuthoring.maxSubdivision); } var probeVolumes = GameObject.FindObjectsOfType(); @@ -111,13 +106,14 @@ public static void FindWorldBounds() ProbeReferenceVolume.instance.clearAssetsOnVolumeClear = true; - var sceneBounds = ProbeReferenceVolume.instance.sceneBounds; + var sceneData = ProbeReferenceVolume.instance.sceneData; HashSet scenesToConsider = new HashSet(); for (int i = 0; i < EditorSceneManager.sceneCount; ++i) { var scene = EditorSceneManager.GetSceneAt(i); - sceneBounds.UpdateSceneBounds(scene); + sceneData.UpdateSceneBounds(scene); + sceneData.EnsurePerSceneData(scene); // !!! IMPORTANT TODO !!! // When we will have the concept of baking set this should be reverted, if a scene is not in the bake set it should not be considered // As of now we include all open scenes as the workflow is not nice or clear. When it'll be we should *NOT* do it. @@ -139,12 +135,12 @@ public static void FindWorldBounds() foreach (var scenePath in scenesToConsider) { bool hasProbeVolumes = false; - if (sceneBounds.hasProbeVolumes.TryGetValue(scenePath, out hasProbeVolumes)) + if (sceneData.hasProbeVolumes.TryGetValue(scenePath, out hasProbeVolumes)) { if (hasProbeVolumes) { Bounds localBound; - if (sceneBounds.sceneBounds.TryGetValue(scenePath, out localBound)) + if (sceneData.sceneBounds.TryGetValue(scenePath, out localBound)) { if (hasFoundBounds) { @@ -165,12 +161,15 @@ public static void FindWorldBounds() { var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Additive); openedScenes.Add(scene); - sceneBounds.UpdateSceneBounds(scene); - Bounds localBound = sceneBounds.sceneBounds[scene.path]; - if (hasFoundBounds) - globalBounds.Encapsulate(localBound); - else - globalBounds = localBound; + if (sceneData.hasProbeVolumes.TryGetValue(scenePath, out hasProbeVolumes)) + { + sceneData.UpdateSceneBounds(scene); + Bounds localBound = sceneData.sceneBounds[scene.path]; + if (hasFoundBounds) + globalBounds.Encapsulate(localBound); + else + globalBounds = localBound; + } } } } @@ -184,57 +183,44 @@ public static void FindWorldBounds() } } - static ProbeReferenceVolumeAuthoring GetCardinalAuthoringComponent(ProbeReferenceVolumeAuthoring[] refVolAuthList) + static void SetBakingContext(ProbeVolumePerSceneData[] perSceneData) { - List enabledVolumes = new List(); + // We need to make sure all scenes we are baking have the same profile. The same should be done for the baking settings, but we check only profile. + // TODO: This should be ensured by the controlling panel, until we have that we need to assert. - foreach (var refVolAuthoring in refVolAuthList) + // To check what are the scenes that have probe volume enabled we checks the ProbeVolumePerSceneData. We are guaranteed to have only one per scene. + for (int i=0; i(); - if (refVolAuthList.Length == 0) - return; + var pvList = GameObject.FindObjectsOfType(); + if (pvList.Length == 0) return; // We have no probe volumes. FindWorldBounds(); - refVolAuthList = GameObject.FindObjectsOfType(); - - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - - if (m_BakingReferenceVolumeAuthoring == null) - { - Debug.Log("Scene(s) have multiple inconsistent ProbeReferenceVolumeAuthoring components. Please ensure they use identical profiles and transforms before baking."); - return; - } + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return; - var refVol = ProbeReferenceVolume.instance; + SetBakingContext(perSceneDataList); AddOccluders(); @@ -276,12 +262,14 @@ static void BrickCountInDirections(out Vector3Int cellsInXYZ, float brickSizeInM // It is only a first iteration of the concept that won't be as impactful on memory as other options. internal static void RevertDilation() { - var refVolAuthList = GameObject.FindObjectsOfType(); - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - if (m_BakingReferenceVolumeAuthoring == null) return; + if (m_BakingProfile == null) + { + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return; + SetBakingContext(perSceneDataList); + } - var dilationSettings = m_BakingReferenceVolumeAuthoring.GetDilationSettings(); + var dilationSettings = m_BakingSettings.dilationSettings; foreach (var cell in ProbeReferenceVolume.instance.cells.Values) { @@ -305,43 +293,30 @@ internal static void RevertDilation() // proper UX. internal static void PerformDilation() { - HashSet refVols = new HashSet(); Dictionary> cell2Assets = new Dictionary>(); - var refVolAuthList = GameObject.FindObjectsOfType(); + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return; - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - if (m_BakingReferenceVolumeAuthoring == null) return; + SetBakingContext(perSceneDataList); - foreach (var refVol in refVolAuthList) + foreach (var sceneData in perSceneDataList) { - if (m_BakingReferenceVolumeAuthoring == null) - m_BakingReferenceVolumeAuthoring = refVol; - - if (refVol.enabled) + var asset = sceneData.GetCurrentStateAsset(); + string assetPath = asset.GetSerializedFullPath(); + foreach (var cell in asset.cells) { - refVols.Add(refVol); - } - } - - foreach (var refVol in refVols) - { - if (refVol.volumeAsset != null) - { - string assetPath = refVol.volumeAsset.GetSerializedFullPath(); - foreach (var cell in refVol.volumeAsset.cells) + if (!cell2Assets.ContainsKey(cell.index)) { - if (!cell2Assets.ContainsKey(cell.index)) - { - cell2Assets.Add(cell.index, new List()); - } - - cell2Assets[cell.index].Add(assetPath); + cell2Assets.Add(cell.index, new List()); } + + cell2Assets[cell.index].Add(assetPath); } + //// We need to queue the asset loading to make sure all is fine when calling refresh. + //sceneData.QueueAssetLoading(); } - var dilationSettings = m_BakingReferenceVolumeAuthoring.GetDilationSettings(); - + var dilationSettings = m_BakingSettings.dilationSettings; if (dilationSettings.dilationDistance > 0.0f) { @@ -365,11 +340,13 @@ internal static void PerformDilation() dilatedCells.Add(cell); } - foreach (var refVol in refVols) + foreach (var sceneData in perSceneDataList) { - if (refVol != null && refVol.volumeAsset != null) + var asset = sceneData.GetCurrentStateAsset(); + string assetPath = asset.GetSerializedFullPath(); + if (asset != null) { - ProbeReferenceVolume.instance.AddPendingAssetRemoval(refVol.volumeAsset); + ProbeReferenceVolume.instance.AddPendingAssetRemoval(asset); } } @@ -380,11 +357,12 @@ internal static void PerformDilation() // Put back cells foreach (var cell in dilatedCells) { - foreach (var refVol in refVols) + foreach (var sceneData in perSceneDataList) { - if (refVol.volumeAsset == null) continue; + var asset = sceneData.GetCurrentStateAsset(); + + if (asset == null) continue; - var asset = refVol.volumeAsset; var assetPath = asset.GetSerializedFullPath(); bool valueFound = false; if (!assetCleared.TryGetValue(assetPath, out valueFound)) @@ -403,10 +381,9 @@ internal static void PerformDilation() UnityEditor.AssetDatabase.SaveAssets(); UnityEditor.AssetDatabase.Refresh(); - foreach (var refVol in refVols) + foreach (var sceneData in perSceneDataList) { - if (refVol.enabled && refVol.gameObject.activeSelf) - refVol.QueueAssetLoading(); + sceneData.QueueAssetLoading(); } } @@ -444,7 +421,7 @@ static void OnAdditionalProbesBakeCompleted() onAdditionalProbesBakeCompletedCalled = true; - var dilationSettings = m_BakingReferenceVolumeAuthoring.GetDilationSettings(); + var dilationSettings = m_BakingSettings.dilationSettings; // Fetch results of all cells for (int c = 0; c < numCells; ++c) { @@ -533,16 +510,15 @@ static void OnAdditionalProbesBakeCompleted() UnityEditor.Experimental.Lightmapping.SetAdditionalBakedProbes(m_BakingBatch.index, null); // Map from each scene to an existing reference volume - var scene2RefVol = new Dictionary(); - foreach (var refVol in GameObject.FindObjectsOfType()) - if (refVol.enabled) - scene2RefVol[refVol.gameObject.scene] = refVol; + var scene2Data = new Dictionary(); + foreach (var data in GameObject.FindObjectsOfType()) + scene2Data[data.gameObject.scene] = data; // Map from each reference volume to its asset - var refVol2Asset = new Dictionary(); - foreach (var refVol in scene2RefVol.Values) + var data2Asset = new Dictionary(); + foreach (var data in scene2Data.Values) { - refVol2Asset[refVol] = ProbeVolumeAsset.CreateAsset(refVol.gameObject.scene); + data2Asset[data] = ProbeVolumeAsset.CreateAsset(data.gameObject.scene); } // Put cells into the respective assets @@ -551,29 +527,33 @@ static void OnAdditionalProbesBakeCompleted() foreach (var scene in m_BakingBatch.cellIndex2SceneReferences[cell.index]) { // This scene has a reference volume authoring component in it? - ProbeReferenceVolumeAuthoring refVol = null; - if (scene2RefVol.TryGetValue(scene, out refVol)) + ProbeVolumePerSceneData data = null; + if (scene2Data.TryGetValue(scene, out data)) { - var asset = refVol2Asset[refVol]; + var asset = data2Asset[data]; asset.cells.Add(cell); - CellCountInDirections(out asset.minCellPosition, out asset.maxCellPosition, refVol.profile.cellSizeInMeters); + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(scene); + asset.StoreProfileData(profile); + Debug.Assert(profile != null); + CellCountInDirections(out asset.minCellPosition, out asset.maxCellPosition, profile.cellSizeInMeters); asset.globalBounds = globalBounds; } } } // Connect the assets to their components - foreach (var pair in refVol2Asset) + foreach (var pair in data2Asset) { - var refVol = pair.Key; + var data = pair.Key; var asset = pair.Value; - refVol.volumeAsset = asset; + // TODO: This will need to use the proper state, not default, when we have them. + data.StoreAssetForState(ProbeVolumeState.Default, asset); if (UnityEditor.Lightmapping.giWorkflowMode != UnityEditor.Lightmapping.GIWorkflowMode.Iterative) { - UnityEditor.EditorUtility.SetDirty(refVol); - UnityEditor.EditorUtility.SetDirty(refVol.volumeAsset); + UnityEditor.EditorUtility.SetDirty(data); + UnityEditor.EditorUtility.SetDirty(asset); } } @@ -587,10 +567,9 @@ static void OnAdditionalProbesBakeCompleted() UnityEditor.AssetDatabase.Refresh(); probeRefVolume.clearAssetsOnVolumeClear = false; - foreach (var refVol in refVol2Asset.Keys) + foreach (var data in data2Asset.Keys) { - if (refVol.enabled && refVol.gameObject.activeSelf) - refVol.QueueAssetLoading(); + data.QueueAssetLoading(); } // ---- Perform dilation --- @@ -651,23 +630,28 @@ public static void RunPlacement() ClearBakingBatch(); // Subdivide the scene and place the bricks - var ctx = PrepareProbeSubdivisionContext(m_BakingReferenceVolumeAuthoring); + var ctx = PrepareProbeSubdivisionContext(); var result = BakeBricks(ctx); // Compute probe positions and send them to the Lightmapper - float brickSize = m_BakingReferenceVolumeAuthoring.brickSize; + float brickSize = m_BakingProfile.minBrickSize; Matrix4x4 newRefToWS = Matrix4x4.TRS(Vector3.zero, Quaternion.identity, new Vector3(brickSize, brickSize, brickSize)); - //m_BakingReferenceVolumeAuthoring; ApplySubdivisionResults(result, newRefToWS); } - public static ProbeSubdivisionContext PrepareProbeSubdivisionContext(ProbeReferenceVolumeAuthoring refVolume) + public static ProbeSubdivisionContext PrepareProbeSubdivisionContext() { ProbeSubdivisionContext ctx = new ProbeSubdivisionContext(); // Prepare all the information in the scene for baking GI. Vector3 refVolOrigin = Vector3.zero; // TODO: This will need to be center of the world bounds. - ctx.Initialize(refVolume, refVolOrigin); + if (m_BakingProfile == null) + { + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return ctx; + SetBakingContext(perSceneDataList); + } + ctx.Initialize(m_BakingProfile, refVolOrigin); return ctx; } @@ -679,7 +663,7 @@ public static ProbeSubdivisionResult BakeBricks(ProbeSubdivisionContext ctx) if (ctx.probeVolumes.Count == 0) return result; - using (var gpuResources = ProbePlacement.AllocateGPUResources(ctx.probeVolumes.Count, ctx.refVolume.profile.maxSubdivision)) + using (var gpuResources = ProbePlacement.AllocateGPUResources(ctx.probeVolumes.Count, ctx.profile.maxSubdivision)) { // subdivide all the cells and generate brick positions foreach (var cell in ctx.cells) @@ -824,7 +808,7 @@ public static void ApplySubdivisionResults(ProbeSubdivisionResult results, Matri // Move positions before sending them var positions = m_BakingBatch.uniquePositions.Keys.ToArray(); - VirtualOffsetSettings voSettings = m_BakingReferenceVolumeAuthoring.GetVirtualOffsetSettings(); + VirtualOffsetSettings voSettings = m_BakingSettings.virtualOffsetSettings; if (voSettings.useVirtualOffset) { for (int i = 0; i < positions.Length; ++i) @@ -832,7 +816,7 @@ public static void ApplySubdivisionResults(ProbeSubdivisionResult results, Matri int subdivLevel = 0; m_BakingBatch.uniqueBrickSubdiv.TryGetValue(positions[i], out subdivLevel); float brickSize = ProbeReferenceVolume.CellSize(subdivLevel); - float searchDistance = (brickSize * m_BakingReferenceVolumeAuthoring.brickSize) / ProbeBrickPool.kBrickCellCount; + float searchDistance = (brickSize * m_BakingProfile.minBrickSize) / ProbeBrickPool.kBrickCellCount; float scaleForSearchDist = voSettings.searchMultiplier; positions[i] = PushPositionOutOfGeometry(positions[i], scaleForSearchDist * searchDistance, voSettings.outOfGeoOffset); diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs index 42f3db83972..a2e0dc1f8b6 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs @@ -277,7 +277,7 @@ public static List SubdivideCell(ProbeReferenceVolume.Volume cellVolume, // In case there is at least one brick in the sub-cell, we need to spawn the parent brick. if (brickCount != brickSet.Count) { - float minBrickSize = subdivisionCtx.refVolume.profile.minBrickSize; + float minBrickSize = subdivisionCtx.profile.minBrickSize; Vector3 cellID = (cellAABB.center - cellAABB.extents) / minBrickSize; float parentSubdivLevel = 3.0f; for (int i = k_MaxSubdivisionInSubCell; i < ctx.maxSubdivisionLevel; i++) @@ -350,7 +350,7 @@ static void SubdivideSubCell(ProbeReferenceVolume.Volume cellVolume, ProbeSubdiv List<(Terrain terrain, ProbeReferenceVolume.Volume volume)> terrains, HashSet brickSet) { var cellAABB = cellVolume.CalculateAABB(); - float minBrickSize = subdivisionCtx.refVolume.profile.minBrickSize; + float minBrickSize = subdivisionCtx.profile.minBrickSize; cellVolume.CalculateCenterAndSize(out var center, out var _); var cmd = CommandBufferPool.Get($"Subdivide (Sub)Cell {center}"); diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs index 132242ae883..c5873116ac1 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs @@ -12,124 +12,11 @@ namespace UnityEngine.Experimental.Rendering [CustomEditor(typeof(ProbeReferenceVolumeAuthoring))] internal class ProbeReferenceVolumeAuthoringEditor : Editor { - [InitializeOnLoad] - class RealtimeProbeSubdivisionDebug - { - static double s_LastSubdivisionTime; - static double s_LastRefreshTime; - static IEnumerator s_CurrentSubdivision; - - static RealtimeProbeSubdivisionDebug() - { - EditorApplication.update -= UpdateRealtimeSubdivisionDebug; - EditorApplication.update += UpdateRealtimeSubdivisionDebug; - } - - static void UpdateRealtimeSubdivisionDebug() - { - var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; - if (!debugDisplay.realtimeSubdivision) - return; - - // Avoid killing the GPU when Unity is in background and runInBackground is disabled - if (!Application.runInBackground && !UnityEditorInternal.InternalEditorUtility.isApplicationActive) - return; - - // update is called 200 times per second so we bring down the update rate to 60hz to avoid overloading the GPU - if (Time.realtimeSinceStartupAsDouble - s_LastRefreshTime < 1.0f / 60.0f) - return; - s_LastRefreshTime = Time.realtimeSinceStartupAsDouble; - - if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds) - { - var probeVolumeAuthoring = FindObjectOfType(); - if (probeVolumeAuthoring == null || !probeVolumeAuthoring.isActiveAndEnabled) - return; - - if (s_CurrentSubdivision == null) - { - // Start a new Subdivision - s_CurrentSubdivision = Subdivide(); - } - - // Step the subdivision with the amount of cell per frame in debug menu - int updatePerFrame = debugDisplay.subdivisionCellUpdatePerFrame; - // From simplification level 5 and higher, the cost of calculating one cell is very high, so we adjust that number. - if (probeVolumeAuthoring.profile.simplificationLevels > 4) - updatePerFrame = (int)Mathf.Max(1, updatePerFrame / Mathf.Pow(9, probeVolumeAuthoring.profile.simplificationLevels - 4)); - for (int i = 0; i < debugDisplay.subdivisionCellUpdatePerFrame; i++) - { - if (!s_CurrentSubdivision.MoveNext()) - { - s_LastSubdivisionTime = Time.realtimeSinceStartupAsDouble; - s_CurrentSubdivision = null; - break; - } - } - - IEnumerator Subdivide() - { - var ctx = ProbeGIBaking.PrepareProbeSubdivisionContext(probeVolumeAuthoring); - - // Cull all the cells that are not visible (we don't need them for realtime debug) - ctx.cells.RemoveAll(c => - { - return probeVolumeAuthoring.ShouldCullCell(c.position); - }); - - Camera activeCamera = Camera.current ?? SceneView.lastActiveSceneView.camera; - - // Sort cells by camera distance to compute the closest cells first - if (activeCamera != null) - { - var cameraPos = activeCamera.transform.position; - ctx.cells.Sort((c1, c2) => - { - c1.volume.CalculateCenterAndSize(out var c1Center, out var _); - float c1Distance = Vector3.Distance(cameraPos, c1Center); - - c2.volume.CalculateCenterAndSize(out var c2Center, out var _); - float c2Distance = Vector3.Distance(cameraPos, c2Center); - - return c1Distance.CompareTo(c2Distance); - }); - } - - // Progressively update cells: - var cells = ctx.cells.ToList(); - - // Remove all the cells that was not updated to prevent ghosting - foreach (var cellVolume in ctx.refVolume.realtimeSubdivisionInfo.Keys.ToList()) - { - if (!cells.Any(c => c.volume.Equals(cellVolume))) - ctx.refVolume.realtimeSubdivisionInfo.Remove(cellVolume); - } - - // Subdivide visible cells - foreach (var cell in cells) - { - // Override the cell list to only compute one cell - ctx.cells.Clear(); - ctx.cells.Add(cell); - - var result = ProbeGIBaking.BakeBricks(ctx); - ctx.refVolume.realtimeSubdivisionInfo[cell.volume] = result.bricksPerCells[cell.position]; - - yield return null; - } - - yield break; - } - } - } - } - private SerializedProperty m_Dilate; private SerializedProperty m_MaxDilationSampleDistance; private SerializedProperty m_DilationValidityThreshold; private SerializedProperty m_DilationIterations; private SerializedProperty m_DilationInvSquaredWeight; - private SerializedProperty m_VolumeAsset; private SerializedProperty m_EnableVirtualOffset; private SerializedProperty m_VirtualOffsetGeometrySearchMultiplier; @@ -137,7 +24,6 @@ IEnumerator Subdivide() private SerializedProperty m_Profile; - internal static readonly GUIContent s_DataAssetLabel = new GUIContent("Data asset", "The asset which serializes all probe related data in this volume."); internal static readonly GUIContent s_ProfileAssetLabel = new GUIContent("Profile", "The asset which determines the characteristics of the probe reference volume."); private static bool DilationGroupEnabled; @@ -155,7 +41,6 @@ private void OnEnable() m_DilationInvSquaredWeight = serializedObject.FindProperty("m_DilationInvSquaredWeight"); m_MaxDilationSampleDistance = serializedObject.FindProperty("m_MaxDilationSampleDistance"); m_DilationValidityThreshold = serializedObject.FindProperty("m_DilationValidityThreshold"); - m_VolumeAsset = serializedObject.FindProperty("volumeAsset"); m_EnableVirtualOffset = serializedObject.FindProperty("m_EnableVirtualOffset"); m_VirtualOffsetGeometrySearchMultiplier = serializedObject.FindProperty("m_VirtualOffsetGeometrySearchMultiplier"); m_VirtualOffsetBiasOutOfGeometry = serializedObject.FindProperty("m_VirtualOffsetBiasOutOfGeometry"); @@ -231,8 +116,6 @@ public override void OnInspectorGUI() m_Profile.objectReferenceValue = asset; } - m_VolumeAsset.objectReferenceValue = EditorGUILayout.ObjectField(s_DataAssetLabel, m_VolumeAsset.objectReferenceValue, typeof(ProbeVolumeAsset), false); - DilationGroupEnabled = EditorGUILayout.BeginFoldoutHeaderGroup(DilationGroupEnabled, "Dilation"); if (DilationGroupEnabled) { diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs index 84f260fe9d1..a281f7dd9c8 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Unity.Collections; using System; +using System.Collections; using System.Linq; using UnityEditor; @@ -12,16 +13,132 @@ namespace UnityEngine.Experimental.Rendering { class ProbeSubdivisionContext { + [InitializeOnLoad] + class RealtimeProbeSubdivisionDebug + { + static double s_LastSubdivisionTime; + static double s_LastRefreshTime; + static IEnumerator s_CurrentSubdivision; + + static RealtimeProbeSubdivisionDebug() + { + EditorApplication.update -= UpdateRealtimeSubdivisionDebug; + EditorApplication.update += UpdateRealtimeSubdivisionDebug; + } + + static void UpdateRealtimeSubdivisionDebug() + { + var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; + if (!debugDisplay.realtimeSubdivision) + return; + + // Avoid killing the GPU when Unity is in background and runInBackground is disabled + if (!Application.runInBackground && !UnityEditorInternal.InternalEditorUtility.isApplicationActive) + return; + + // update is called 200 times per second so we bring down the update rate to 60hz to avoid overloading the GPU + if (Time.realtimeSinceStartupAsDouble - s_LastRefreshTime < 1.0f / 60.0f) + return; + s_LastRefreshTime = Time.realtimeSinceStartupAsDouble; + + if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds) + { + var probeVolume = GameObject.FindObjectOfType(); + if (probeVolume == null || !probeVolume.isActiveAndEnabled || ProbeReferenceVolume.instance.sceneData == null) + return; + + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(probeVolume.gameObject.scene); + if (profile == null) + return; + + if (s_CurrentSubdivision == null) + { + // Start a new Subdivision + s_CurrentSubdivision = Subdivide(); + } + + // Step the subdivision with the amount of cell per frame in debug menu + int updatePerFrame = debugDisplay.subdivisionCellUpdatePerFrame; + // From simplification level 5 and higher, the cost of calculating one cell is very high, so we adjust that number. + if (profile.simplificationLevels > 4) + updatePerFrame = (int)Mathf.Max(1, updatePerFrame / Mathf.Pow(9, profile.simplificationLevels - 4)); + for (int i = 0; i < debugDisplay.subdivisionCellUpdatePerFrame; i++) + { + if (!s_CurrentSubdivision.MoveNext()) + { + s_LastSubdivisionTime = Time.realtimeSinceStartupAsDouble; + s_CurrentSubdivision = null; + break; + } + } + + IEnumerator Subdivide() + { + var ctx = ProbeGIBaking.PrepareProbeSubdivisionContext(); + + // Cull all the cells that are not visible (we don't need them for realtime debug) + ctx.cells.RemoveAll(c => + { + return probeVolume.ShouldCullCell(c.position); + }); + + Camera activeCamera = Camera.current ?? SceneView.lastActiveSceneView.camera; + + // Sort cells by camera distance to compute the closest cells first + if (activeCamera != null) + { + var cameraPos = activeCamera.transform.position; + ctx.cells.Sort((c1, c2) => + { + c1.volume.CalculateCenterAndSize(out var c1Center, out var _); + float c1Distance = Vector3.Distance(cameraPos, c1Center); + + c2.volume.CalculateCenterAndSize(out var c2Center, out var _); + float c2Distance = Vector3.Distance(cameraPos, c2Center); + + return c1Distance.CompareTo(c2Distance); + }); + } + + // Progressively update cells: + var cells = ctx.cells.ToList(); + + // Remove all the cells that was not updated to prevent ghosting + foreach (var cellVolume in ProbeReferenceVolume.instance.realtimeSubdivisionInfo.Keys.ToList()) + { + if (!cells.Any(c => c.volume.Equals(cellVolume))) + ProbeReferenceVolume.instance.realtimeSubdivisionInfo.Remove(cellVolume); + } + + // Subdivide visible cells + foreach (var cell in cells) + { + // Override the cell list to only compute one cell + ctx.cells.Clear(); + ctx.cells.Add(cell); + + var result = ProbeGIBaking.BakeBricks(ctx); + ProbeReferenceVolume.instance.realtimeSubdivisionInfo[cell.volume] = result.bricksPerCells[cell.position]; + + yield return null; + } + + yield break; + } + } + } + } + public List<(ProbeVolume component, ProbeReferenceVolume.Volume volume)> probeVolumes = new List<(ProbeVolume, ProbeReferenceVolume.Volume)>(); public List<(Renderer component, ProbeReferenceVolume.Volume volume)> renderers = new List<(Renderer, ProbeReferenceVolume.Volume)>(); public List<(Vector3Int position, ProbeReferenceVolume.Volume volume)> cells = new List<(Vector3Int, ProbeReferenceVolume.Volume)>(); public List<(Terrain, ProbeReferenceVolume.Volume volume)> terrains = new List<(Terrain, ProbeReferenceVolume.Volume)>(); - public ProbeReferenceVolumeAuthoring refVolume; + public ProbeReferenceVolumeProfile profile; - public void Initialize(ProbeReferenceVolumeAuthoring refVolume, Vector3 refVolOrigin) + public void Initialize(ProbeReferenceVolumeProfile profile, Vector3 refVolOrigin) { - this.refVolume = refVolume; - float cellSize = refVolume.cellSizeInMeters; + this.profile = profile; + float cellSize = profile.cellSizeInMeters; foreach (var pv in UnityEngine.Object.FindObjectsOfType()) { diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs index 02b5a3c9d0c..7eaa3ea32dd 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs @@ -53,6 +53,8 @@ class CellInstancedDebugProbes internal float dilationValidtyThreshold = 0.25f; // We ned to store this here to access it + // Field used for the realtime subdivision preview + internal Dictionary> realtimeSubdivisionInfo = new Dictionary>(); /// /// Render Probe Volume related debug @@ -238,6 +240,7 @@ void DrawProbeDebug(Camera camera) void ClearDebugData() { m_CellDebugData.Clear(); + realtimeSubdivisionInfo.Clear(); } void CreateInstancedProbes() diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs index 48d1a256dee..438e8464429 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs @@ -228,7 +228,7 @@ public struct ProbeVolumeSystemParameters /// public Shader probeDebugShader; - public ProbeVolumeSceneBounds sceneBounds; + public ProbeVolumeSceneData sceneData; public ProbeVolumeSHBands shBands; } @@ -515,7 +515,7 @@ public override bool Equals(object obj) internal Dictionary cells = new Dictionary(); Dictionary m_ChunkInfo = new Dictionary(); - internal ProbeVolumeSceneBounds sceneBounds; + internal ProbeVolumeSceneData sceneData; /// @@ -621,11 +621,11 @@ public void Initialize(in ProbeVolumeSystemParameters parameters) InitProbeReferenceVolume(kProbeIndexPoolAllocationSize, m_MemoryBudget, m_SHBands); m_IsInitialized = true; m_NeedsIndexRebuild = true; - sceneBounds = parameters.sceneBounds; + sceneData = parameters.sceneData; #if UNITY_EDITOR - if (sceneBounds != null) + if (sceneData != null) { - UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += sceneBounds.UpdateSceneBounds; + UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += sceneData.OnSceneSaved; } #endif } @@ -816,6 +816,11 @@ void LoadAsset(ProbeVolumeAsset asset) var path = asset.GetSerializedFullPath(); + // Load info coming originally from profile + SetTRS(Vector3.zero, Quaternion.identity, asset.minBrickSize); + SetMaxSubdivision(asset.maxSubdivision); + + for (int i = 0; i < asset.cells.Count; ++i) { var cell = asset.cells[i]; diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs index 7b0516011c7..d03d6112b99 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs @@ -75,9 +75,6 @@ internal static ProbeReferenceVolumeProfile CreateReferenceVolumeProfile(Scene s [SerializeField] ProbeReferenceVolumeProfile m_Profile = null; -#if UNITY_EDITOR - ProbeReferenceVolumeProfile m_PrevProfile = null; -#endif internal ProbeReferenceVolumeProfile profile { get { return m_Profile; } } internal float brickSize { get { return m_Profile.minBrickSize; } } @@ -104,230 +101,49 @@ internal static ProbeReferenceVolumeProfile CreateReferenceVolumeProfile(Scene s [SerializeField] float m_VirtualOffsetBiasOutOfGeometry = 0.01f; - // Field used for the realtime subdivision preview [NonSerialized] - internal Dictionary> realtimeSubdivisionInfo = new Dictionary>(); - - MeshGizmo brickGizmos; - MeshGizmo cellGizmo; + bool m_SentDataToSceneData = false; // TODO: This is temp until we don't have a setting panel. - // In some cases Unity will magically popuplate this private field with a correct value even though it should not be serialized. - // The [NonSerialized] attribute allows to force the asset to be null in case a domain reload happens. - [NonSerialized] - ProbeVolumeAsset m_PrevAsset = null; -#endif [SerializeField] float m_DilationValidityThreshold = 0.25f; +#endif public ProbeVolumeAsset volumeAsset = null; - internal void LoadProfileInformation() - { - if (m_Profile == null) - return; - - var refVol = ProbeReferenceVolume.instance; - refVol.SetTRS(Vector3.zero, Quaternion.identity, m_Profile.minBrickSize); - refVol.SetMaxSubdivision(m_Profile.maxSubdivision); - refVol.dilationValidtyThreshold = m_DilationValidityThreshold; - } - - internal void QueueAssetLoading() - { - LoadProfileInformation(); - - if (volumeAsset != null) - ProbeReferenceVolume.instance.AddPendingAssetLoading(volumeAsset); - } - - internal void QueueAssetRemoval() - { - if (volumeAsset == null) - return; - #if UNITY_EDITOR - brickGizmos?.Dispose(); - brickGizmos = null; - cellGizmo?.Dispose(); - cellGizmo = null; - m_PrevAsset = null; -#endif - - ProbeReferenceVolume.instance.AddPendingAssetRemoval(volumeAsset); + // TEMP! THIS NEEDS TO BE REMOVED WHEN WE HAVE THE SETTINGS PANEL. + void SendSceneData(bool force = false) + { + if (ProbeReferenceVolume.instance.sceneData == null) return; + if (!m_SentDataToSceneData || force) + { + ProbeReferenceVolume.instance.sceneData.SetBakeSettingsForScene(gameObject.scene, GetDilationSettings(), GetVirtualOffsetSettings()); + ProbeReferenceVolume.instance.sceneData.SetProfileForScene(gameObject.scene, m_Profile); + m_SentDataToSceneData = true; + } } void OnEnable() { -#if UNITY_EDITOR if (m_Profile == null) m_Profile = CreateReferenceVolumeProfile(gameObject.scene, gameObject.name); -#endif - QueueAssetLoading(); + SendSceneData(force: true); } -#if UNITY_EDITOR - void OnValidate() { if (!enabled || !gameObject.activeSelf) return; - if (m_Profile != null) - { - m_PrevProfile = m_Profile; - } - - if (volumeAsset != m_PrevAsset && m_PrevAsset != null) - { - ProbeReferenceVolume.instance.AddPendingAssetRemoval(m_PrevAsset); - } - - if (volumeAsset != m_PrevAsset) - { - QueueAssetLoading(); - } - - m_PrevAsset = volumeAsset; + SendSceneData(force: true); } - void OnDisable() - { - QueueAssetRemoval(); - } - - void OnDestroy() - { - QueueAssetRemoval(); - } - - internal bool ShouldCullCell(Vector3 cellPosition, Vector3 originWS = default(Vector3)) - { - if (m_Profile == null) - return true; - - var cameraTransform = SceneView.lastActiveSceneView.camera.transform; - - Vector3 cellCenterWS = cellPosition * m_Profile.cellSizeInMeters + originWS + Vector3.one * (m_Profile.cellSizeInMeters / 2.0f); - - // Round down to cell size distance - float roundedDownDist = Mathf.Floor(Vector3.Distance(cameraTransform.position, cellCenterWS) / m_Profile.cellSizeInMeters) * m_Profile.cellSizeInMeters; - - if (roundedDownDist > ProbeReferenceVolume.instance.debugDisplay.subdivisionViewCullingDistance) - return true; - - var frustumPlanes = GeometryUtility.CalculateFrustumPlanes(SceneView.lastActiveSceneView.camera); - var volumeAABB = new Bounds(cellCenterWS, m_Profile.cellSizeInMeters * Vector3.one); - return !GeometryUtility.TestPlanesAABB(frustumPlanes, volumeAABB); - } - - // TODO: We need to get rid of Handles.DrawWireCube to be able to have those at runtime as well. - void OnDrawGizmos() + // IMPORTANT TODO: This is to be deleted when we have the proper setting panel. + private void Update() { - if (!enabled || !gameObject.activeSelf || !ProbeReferenceVolume.instance.isInitialized) - return; - - var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; - - if (debugDisplay.drawBricks) - { - var subdivColors = ProbeReferenceVolume.instance.subdivisionDebugColors; - - IEnumerable GetVisibleBricks() - { - if (debugDisplay.realtimeSubdivision) - { - // realtime subdiv cells are already culled - foreach (var kp in realtimeSubdivisionInfo) - { - var cellVolume = kp.Key; - - foreach (var brick in kp.Value) - { - yield return brick; - } - } - } - else - { - foreach (var cell in ProbeReferenceVolume.instance.cells.Values) - { - if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) - continue; - - if (cell.bricks == null) - continue; - - foreach (var brick in cell.bricks) - yield return brick; - } - } - } - - if (brickGizmos == null) - brickGizmos = new MeshGizmo((int)(Mathf.Pow(3, ProbeBrickIndex.kMaxSubdivisionLevels) * MeshGizmo.vertexCountPerCube)); - - brickGizmos.Clear(); - foreach (var brick in GetVisibleBricks()) - { - if (brick.subdivisionLevel < 0) - continue; - - Vector3 scaledSize = Vector3.one * Mathf.Pow(3, brick.subdivisionLevel); - Vector3 scaledPos = brick.position + scaledSize / 2; - brickGizmos.AddWireCube(scaledPos, scaledSize, subdivColors[brick.subdivisionLevel]); - } - - brickGizmos.RenderWireframe(ProbeReferenceVolume.instance.GetRefSpaceToWS(), gizmoName: "Brick Gizmo Rendering"); - } - - if (debugDisplay.drawCells) - { - IEnumerable GetVisibleCellCenters() - { - if (debugDisplay.realtimeSubdivision) - { - foreach (var kp in realtimeSubdivisionInfo) - { - kp.Key.CalculateCenterAndSize(out var center, out var _); - yield return center; - } - } - else - { - foreach (var cell in ProbeReferenceVolume.instance.cells.Values) - { - if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) - continue; - - var positionF = new Vector3(cell.position.x, cell.position.y, cell.position.z); - var center = positionF * m_Profile.cellSizeInMeters + m_Profile.cellSizeInMeters * 0.5f * Vector3.one; - yield return center; - } - } - } - - Matrix4x4 trs = Matrix4x4.TRS(ProbeReferenceVolume.instance.GetTransform().posWS, ProbeReferenceVolume.instance.GetTransform().rot, Vector3.one); - - // For realtime subdivision, the matrix from ProbeReferenceVolume.instance can be wrong if the profile changed since the last bake - if (debugDisplay.realtimeSubdivision) - trs = Matrix4x4.TRS(transform.position, Quaternion.identity, Vector3.one); - - // Fetching this from components instead of from the reference volume allows the user to - // preview how cells will look before they commit to a bake. - Gizmos.color = new Color(0, 1, 0.5f, 0.2f); - Gizmos.matrix = trs; - if (cellGizmo == null) - cellGizmo = new MeshGizmo(); - cellGizmo.Clear(); - foreach (var center in GetVisibleCellCenters()) - { - Gizmos.DrawCube(center, Vector3.one * m_Profile.cellSizeInMeters); - cellGizmo.AddWireCube(center, Vector3.one * m_Profile.cellSizeInMeters, new Color(0, 1, 0.5f, 1)); - } - cellGizmo.RenderWireframe(Gizmos.matrix, gizmoName: "Brick Gizmo Rendering"); - } + SendSceneData(); } public ProbeDilationSettings GetDilationSettings() diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs index ba36ace86a8..74378765a81 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs @@ -3,8 +3,10 @@ using UnityEditor.Experimental; using Unity.Collections; using System.Collections.Generic; -#if UNITY_EDITOR +using UnityEngine.Rendering; using UnityEngine.SceneManagement; + +#if UNITY_EDITOR using UnityEditor; #endif @@ -120,5 +122,176 @@ public override int GetHashCode() } #endif + + // Momentarily moving the gizmo rendering for bricks and cells to Probe Volume itself, + // only the first probe volume in the scene will render them. The reason is that we dont have any + // other non-hidden component related to APV. + #region APVGizmo + + MeshGizmo brickGizmos; + MeshGizmo cellGizmo; + + void DisposeGizmos() + { + brickGizmos?.Dispose(); + brickGizmos = null; + cellGizmo?.Dispose(); + cellGizmo = null; + } + + void OnDestroy() + { + DisposeGizmos(); + } + + void OnDisable() + { + DisposeGizmos(); + } +#if UNITY_EDITOR + + // Only the first PV of the available ones will draw gizmos. + bool IsResponsibleToDrawGizmo() + { + var pvList = GameObject.FindObjectsOfType(); + return this == pvList[0]; + } + + internal bool ShouldCullCell(Vector3 cellPosition, Vector3 originWS = default(Vector3)) + { + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(gameObject.scene); + if (profile == null) + return true; + + var cameraTransform = SceneView.lastActiveSceneView.camera.transform; + + Vector3 cellCenterWS = cellPosition * profile.cellSizeInMeters + originWS + Vector3.one * (profile.cellSizeInMeters / 2.0f); + + // Round down to cell size distance + float roundedDownDist = Mathf.Floor(Vector3.Distance(cameraTransform.position, cellCenterWS) / profile.cellSizeInMeters) * profile.cellSizeInMeters; + + if (roundedDownDist > ProbeReferenceVolume.instance.debugDisplay.subdivisionViewCullingDistance) + return true; + + var frustumPlanes = GeometryUtility.CalculateFrustumPlanes(SceneView.lastActiveSceneView.camera); + var volumeAABB = new Bounds(cellCenterWS, profile.cellSizeInMeters * Vector3.one); + + return !GeometryUtility.TestPlanesAABB(frustumPlanes, volumeAABB); + } + + // TODO: We need to get rid of Handles.DrawWireCube to be able to have those at runtime as well. + void OnDrawGizmos() + { + if (!ProbeReferenceVolume.instance.isInitialized || !IsResponsibleToDrawGizmo() || ProbeReferenceVolume.instance.sceneData == null) + return; + + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(gameObject.scene); + if (profile == null) + return; + + var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; + + if (debugDisplay.drawBricks) + { + var subdivColors = ProbeReferenceVolume.instance.subdivisionDebugColors; + + IEnumerable GetVisibleBricks() + { + if (debugDisplay.realtimeSubdivision) + { + // realtime subdiv cells are already culled + foreach (var kp in ProbeReferenceVolume.instance.realtimeSubdivisionInfo) + { + var cellVolume = kp.Key; + + foreach (var brick in kp.Value) + { + yield return brick; + } + } + } + else + { + foreach (var cell in ProbeReferenceVolume.instance.cells.Values) + { + if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) + continue; + + if (cell.bricks == null) + continue; + + foreach (var brick in cell.bricks) + yield return brick; + } + } + } + + if (brickGizmos == null) + brickGizmos = new MeshGizmo((int)(Mathf.Pow(3, ProbeBrickIndex.kMaxSubdivisionLevels) * MeshGizmo.vertexCountPerCube)); + + brickGizmos.Clear(); + foreach (var brick in GetVisibleBricks()) + { + if (brick.subdivisionLevel < 0) + continue; + + Vector3 scaledSize = Vector3.one * Mathf.Pow(3, brick.subdivisionLevel); + Vector3 scaledPos = brick.position + scaledSize / 2; + brickGizmos.AddWireCube(scaledPos, scaledSize, subdivColors[brick.subdivisionLevel]); + } + + brickGizmos.RenderWireframe(ProbeReferenceVolume.instance.GetRefSpaceToWS(), gizmoName: "Brick Gizmo Rendering"); + } + + if (debugDisplay.drawCells) + { + IEnumerable GetVisibleCellCenters() + { + if (debugDisplay.realtimeSubdivision) + { + foreach (var kp in ProbeReferenceVolume.instance.realtimeSubdivisionInfo) + { + kp.Key.CalculateCenterAndSize(out var center, out var _); + yield return center; + } + } + else + { + foreach (var cell in ProbeReferenceVolume.instance.cells.Values) + { + if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) + continue; + + var positionF = new Vector3(cell.position.x, cell.position.y, cell.position.z); + var center = positionF * profile.cellSizeInMeters + profile.cellSizeInMeters * 0.5f * Vector3.one; + yield return center; + } + } + } + + Matrix4x4 trs = Matrix4x4.TRS(ProbeReferenceVolume.instance.GetTransform().posWS, ProbeReferenceVolume.instance.GetTransform().rot, Vector3.one); + + // For realtime subdivision, the matrix from ProbeReferenceVolume.instance can be wrong if the profile changed since the last bake + if (debugDisplay.realtimeSubdivision) + trs = Matrix4x4.TRS(transform.position, Quaternion.identity, Vector3.one); + + // Fetching this from components instead of from the reference volume allows the user to + // preview how cells will look before they commit to a bake. + Gizmos.color = new Color(0, 1, 0.5f, 0.2f); + Gizmos.matrix = trs; + if (cellGizmo == null) + cellGizmo = new MeshGizmo(); + cellGizmo.Clear(); + foreach (var center in GetVisibleCellCenters()) + { + Gizmos.DrawCube(center, Vector3.one * profile.cellSizeInMeters); + cellGizmo.AddWireCube(center, Vector3.one * profile.cellSizeInMeters, new Color(0, 1, 0.5f, 1)); + } + cellGizmo.RenderWireframe(Gizmos.matrix, gizmoName: "Brick Gizmo Rendering"); + } + } + +#endif + #endregion } } // UnityEngine.Experimental.Rendering.HDPipeline diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs index 77b75043f5d..c11486336ea 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs @@ -33,6 +33,15 @@ internal enum AssetVersion [SerializeField] string m_AssetFullPath = "UNINITIALIZED!"; + // Profile info + [SerializeField] internal int cellSizeInBricks; + [SerializeField] internal float minDistanceBetweenProbes; + [SerializeField] internal int simplificationLevels; + + internal int maxSubdivision => simplificationLevels + 1; // we add one for the top subdiv level which is the same size as a cell + internal float minBrickSize => Mathf.Max(0.01f, minDistanceBetweenProbes * 3.0f); + + public string GetSerializedFullPath() { return m_AssetFullPath; @@ -71,6 +80,12 @@ public static ProbeVolumeAsset CreateAsset(Scene scene) return asset; } + internal void StoreProfileData(ProbeReferenceVolumeProfile profile) + { + cellSizeInBricks = profile.cellSizeInBricks; + simplificationLevels = profile.simplificationLevels; + minDistanceBetweenProbes = profile.minDistanceBetweenProbes; + } #endif } diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs new file mode 100644 index 00000000000..9b4c34c3d87 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs @@ -0,0 +1,14 @@ +using UnityEngine.Rendering; +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace UnityEngine.Experimental.Rendering +{ + // TODO: Use this structure in the actual authoring component rather than just a mean to group output parameters. + internal struct ProbeVolumeBakingProcessSettings + { + public ProbeDilationSettings dilationSettings; + public VirtualOffsetSettings virtualOffsetSettings; + } +} diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs.meta b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs.meta similarity index 83% rename from com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs.meta rename to com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs.meta index 8d499648c46..bc63c960f12 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs.meta +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2aadc37bd110b7a4895abe8f9fa3d776 +guid: 2ca179cc72ecf4f4fa7d4ed3bb83ffd2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs new file mode 100644 index 00000000000..00cd3f02af6 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs @@ -0,0 +1,144 @@ +using UnityEngine.Rendering; +using UnityEngine.SceneManagement; +using System.IO; +using System; +using System.Collections.Generic; + +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace UnityEngine.Experimental.Rendering +{ + // TMP to be moved to ProbeReferenceVolume when we define the concept, here it is just to make stuff compile + enum ProbeVolumeState + { + Default = 0, + Invalid = 999 + } + + [ExecuteAlways] + [AddComponentMenu("")] // Hide. + internal class ProbeVolumePerSceneData : MonoBehaviour, ISerializationCallbackReceiver + { + + [System.Serializable] + struct SerializableAssetItem + { + [SerializeField] public ProbeVolumeState state; + [SerializeField] public ProbeVolumeAsset asset; + } + + internal Dictionary assets = new Dictionary(); + + [SerializeField] List serializedAssets; + + ProbeVolumeState m_CurrentState = ProbeVolumeState.Default; + ProbeVolumeState m_PreviousState = ProbeVolumeState.Invalid; + + /// + /// OnAfterDeserialize implementation. + /// + public void OnAfterDeserialize() + { + if (serializedAssets == null) return; + + assets = new Dictionary(); + foreach (var assetItem in serializedAssets) + { + assets.Add(assetItem.state, assetItem.asset); + } + } + + /// + /// OnBeforeSerialize implementation. + /// + public void OnBeforeSerialize() + { + if (assets == null || serializedAssets == null) return; + + serializedAssets.Clear(); + foreach (var k in assets.Keys) + { + SerializableAssetItem item; + item.state = k; + item.asset = assets[k]; + serializedAssets.Add(item); + } + } + + internal void StoreAssetForState(ProbeVolumeState state, ProbeVolumeAsset asset) + { + assets[state] = asset; + } + + internal void InvalidateAllAssets() + { + foreach (var asset in assets.Values) + { + if (asset != null) + ProbeReferenceVolume.instance.AddPendingAssetRemoval(asset); + } + + assets.Clear(); + } + + internal ProbeVolumeAsset GetCurrentStateAsset() + { + if (assets.ContainsKey(m_CurrentState)) return assets[m_CurrentState]; + else return null; + } + + internal void QueueAssetLoading() + { + var refVol = ProbeReferenceVolume.instance; + if (assets.ContainsKey(m_CurrentState) && assets[m_CurrentState] != null) + { + refVol.AddPendingAssetLoading(assets[m_CurrentState]); +#if UNITY_EDITOR + if (refVol.sceneData != null) + { + refVol.dilationValidtyThreshold = refVol.sceneData.GetBakeSettingsForScene(gameObject.scene).dilationSettings.dilationValidityThreshold; + } +#endif + } + } + + internal void QueueAssetRemoval() + { + if (assets.ContainsKey(m_CurrentState) && assets[m_CurrentState] != null) + ProbeReferenceVolume.instance.AddPendingAssetRemoval(assets[m_CurrentState]); + } + + void OnEnable() + { + QueueAssetLoading(); + } + + void OnDisable() + { + QueueAssetRemoval(); + } + + void OnDestroy() + { + QueueAssetRemoval(); + } + + void Update() + { + // Query state from ProbeReferenceVolume.instance. + // This is temporary here until we implement a state system. + m_CurrentState = ProbeVolumeState.Default; + + if (m_PreviousState != m_CurrentState) + { + if (assets.ContainsKey(m_PreviousState) && assets[m_PreviousState] != null) + ProbeReferenceVolume.instance.AddPendingAssetRemoval(assets[m_PreviousState]); + + QueueAssetLoading(); + } + m_PreviousState = m_CurrentState; + } + } +} diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta new file mode 100644 index 00000000000..1433c28c021 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a83d2f7ae04ab6f4f99b0d85377be998 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs similarity index 58% rename from com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs rename to com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs index 65c0d56a8db..05b483511d2 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs @@ -5,13 +5,23 @@ #endif using UnityEngine; using UnityEngine.SceneManagement; +using System.Reflection; namespace UnityEngine.Experimental.Rendering { + // Add Profile and baking settings. + [System.Serializable] /// A class containing info about the bounds defined by the probe volumes in various scenes. - public class ProbeVolumeSceneBounds : ISerializationCallbackReceiver + public class ProbeVolumeSceneData : ISerializationCallbackReceiver { + static PropertyInfo s_SceneGUID = typeof(Scene).GetProperty("guid", System.Reflection.BindingFlags.NonPublic | BindingFlags.Instance); + string GetSceneGUID(Scene scene) + { + Debug.Assert(s_SceneGUID != null, "Reflection for scene GUID failed"); + return (string)s_SceneGUID.GetValue(scene); + } + [System.Serializable] struct SerializableBoundItem { @@ -26,27 +36,50 @@ struct SerializableHasPVItem [SerializeField] public bool hasProbeVolumes; } + [System.Serializable] + struct SerializablePVProfile + { + [SerializeField] public string sceneGUID; + [SerializeField] public ProbeReferenceVolumeProfile profile; + } + + [System.Serializable] + struct SerializablePVBakeSettings + { + [SerializeField] public string sceneGUID; + [SerializeField] public ProbeVolumeBakingProcessSettings settings; + } + [SerializeField] List serializedBounds; [SerializeField] List serializedHasVolumes; + [SerializeField] List serializedProfiles; + [SerializeField] List serializedBakeSettings; Object m_ParentAsset = null; /// A dictionary containing the Bounds defined by probe volumes for each scene (scene path is the key of the dictionary). public Dictionary sceneBounds; internal Dictionary hasProbeVolumes; + internal Dictionary sceneProfiles; + internal Dictionary sceneBakingSettings; - /// Constructor for ProbeVolumeSceneBounds. - /// The asset holding this ProbeVolumeSceneBounds, it will be dirtied every time scene bounds are updated. - public ProbeVolumeSceneBounds(Object parentAsset) + /// Constructor for ProbeVolumeSceneData. + /// The asset holding this ProbeVolumeSceneData, it will be dirtied every time scene bounds or settings are changed. + public ProbeVolumeSceneData(Object parentAsset) { m_ParentAsset = parentAsset; sceneBounds = new Dictionary(); hasProbeVolumes = new Dictionary(); + sceneProfiles = new Dictionary(); + sceneBakingSettings = new Dictionary(); + serializedBounds = new List(); serializedHasVolumes = new List(); + serializedProfiles = new List(); + serializedBakeSettings = new List(); } - /// Set a reference to the object holding this ProbeVolumeSceneBounds. - /// The object holding this ProbeVolumeSceneBounds, it will be dirtied every time scene bounds are updated. + /// Set a reference to the object holding this ProbeVolumeSceneData. + /// The object holding this ProbeVolumeSceneData, it will be dirtied every time scene bounds or settings are changed. public void SetParentObject(Object parent) { m_ParentAsset = parent; @@ -58,10 +91,14 @@ public void SetParentObject(Object parent) public void OnAfterDeserialize() { // We haven't initialized the bounds, no need to do anything here. - if (serializedBounds == null || serializedHasVolumes == null) return; + if (serializedBounds == null || serializedHasVolumes == null || + serializedProfiles == null || serializedBakeSettings == null) return; sceneBounds = new Dictionary(); hasProbeVolumes = new Dictionary(); + sceneProfiles = new Dictionary(); + sceneBakingSettings = new Dictionary(); + foreach (var boundItem in serializedBounds) { sceneBounds.Add(boundItem.scenePath, boundItem.bounds); @@ -71,6 +108,16 @@ public void OnAfterDeserialize() { hasProbeVolumes.Add(boundItem.scenePath, boundItem.hasProbeVolumes); } + + foreach (var profileItem in serializedProfiles) + { + sceneProfiles.Add(profileItem.sceneGUID, profileItem.profile); + } + + foreach (var settingsItem in serializedBakeSettings) + { + sceneBakingSettings.Add(settingsItem.sceneGUID, settingsItem.settings); + } } /// @@ -79,11 +126,14 @@ public void OnAfterDeserialize() public void OnBeforeSerialize() { // We haven't initialized the bounds, no need to do anything here. - if (sceneBounds == null || hasProbeVolumes == null || - serializedBounds == null || serializedHasVolumes == null) return; + if (sceneBounds == null || hasProbeVolumes == null || sceneBakingSettings == null || sceneProfiles == null || + serializedBounds == null || serializedHasVolumes == null || serializedBakeSettings == null || serializedProfiles == null) return; serializedBounds.Clear(); serializedHasVolumes.Clear(); + serializedProfiles.Clear(); + serializedBakeSettings.Clear(); + foreach (var k in sceneBounds.Keys) { SerializableBoundItem item; @@ -99,6 +149,22 @@ public void OnBeforeSerialize() item.hasProbeVolumes = hasProbeVolumes[k]; serializedHasVolumes.Add(item); } + + foreach (var k in sceneBakingSettings.Keys) + { + SerializablePVBakeSettings item; + item.sceneGUID = k; + item.settings = sceneBakingSettings[k]; + serializedBakeSettings.Add(item); + } + + foreach (var k in sceneProfiles.Keys) + { + SerializablePVProfile item; + item.sceneGUID = k; + item.profile = sceneProfiles[k]; + serializedProfiles.Add(item); + } } #if UNITY_EDITOR @@ -159,6 +225,15 @@ private void InflateBound(ref Bounds bounds) internal void UpdateSceneBounds(Scene scene) { + // If we have not yet loaded any asset, we haven't initialized the probe reference volume with any info from the profile. + // As a result we need to prime with the profile info directly stored here. + { + var profile = GetProfileForScene(scene); + Debug.Assert(profile != null); + ProbeReferenceVolume.instance.SetTRS(Vector3.zero, Quaternion.identity, profile.minBrickSize); + ProbeReferenceVolume.instance.SetMaxSubdivision(profile.maxSubdivision); + } + var volumes = UnityEngine.GameObject.FindObjectsOfType(); bool boundFound = false; Bounds newBound = new Bounds(); @@ -218,6 +293,83 @@ internal void UpdateSceneBounds(Scene scene) } } + // It is important this is called after UpdateSceneBounds is called! + internal void EnsurePerSceneData(Scene scene) + { + if (hasProbeVolumes.ContainsKey(scene.path) && hasProbeVolumes[scene.path]) + { + var perSceneData = UnityEngine.GameObject.FindObjectsOfType(); + var sceneGUID = GetSceneGUID(scene); + + bool foundPerSceneData = false; + foreach (var data in perSceneData) + { + if (GetSceneGUID(data.gameObject.scene) == sceneGUID) + { + foundPerSceneData = true; + } + } + + if (!foundPerSceneData) + { + GameObject go = new GameObject("ProbeVolumePerSceneData"); + go.hideFlags |= HideFlags.HideInHierarchy; + go.AddComponent(); + SceneManager.MoveGameObjectToScene(go, scene); + } + } + } + + internal void OnSceneSaved(Scene scene) + { + UpdateSceneBounds(scene); + EnsurePerSceneData(scene); + } + + + internal void SetProfileForScene(Scene scene, ProbeReferenceVolumeProfile profile) + { + if (sceneProfiles == null) sceneProfiles = new Dictionary(); + + var sceneGUID = GetSceneGUID(scene); + sceneProfiles[sceneGUID] = profile; + } + + internal void SetBakeSettingsForScene(Scene scene, ProbeDilationSettings dilationSettings, VirtualOffsetSettings virtualOffsetSettings) + { + if (sceneBakingSettings == null) sceneBakingSettings = new Dictionary(); + + var sceneGUID = GetSceneGUID(scene); + + ProbeVolumeBakingProcessSettings settings = new ProbeVolumeBakingProcessSettings(); + settings.dilationSettings = dilationSettings; + settings.virtualOffsetSettings = virtualOffsetSettings; + sceneBakingSettings[sceneGUID] = settings; + } + + internal ProbeReferenceVolumeProfile GetProfileForScene(Scene scene) + { + var sceneGUID = GetSceneGUID(scene); + if (sceneProfiles != null && sceneProfiles.ContainsKey(sceneGUID)) + return sceneProfiles[sceneGUID]; + + return null; + } + + internal bool BakeSettingsDefinedForScene(Scene scene) + { + var sceneGUID = GetSceneGUID(scene); + return sceneBakingSettings.ContainsKey(sceneGUID); + } + + internal ProbeVolumeBakingProcessSettings GetBakeSettingsForScene(Scene scene) + { + var sceneGUID = GetSceneGUID(scene); + if (sceneBakingSettings != null && sceneBakingSettings.ContainsKey(sceneGUID)) + return sceneBakingSettings[sceneGUID]; + + return new ProbeVolumeBakingProcessSettings(); + } #endif } } diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta new file mode 100644 index 00000000000..7fcd88fff02 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 04fb4740d8c6dbc469086e13c435cd4b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 4999e4d1fed..92a3a394136 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -52,7 +52,7 @@ class SerializedHDRenderPipelineGlobalSettings public SerializedProperty DLSSProjectId; public SerializedProperty useDLSSCustomProjectId; - public SerializedProperty apvSceneBounds; + public SerializedProperty apvScenesData; internal ReorderableList uiBeforeTransparentCustomPostProcesses; internal ReorderableList uiBeforeTAACustomPostProcesses; @@ -145,7 +145,7 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec DLSSProjectId = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.DLSSProjectId); useDLSSCustomProjectId = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.useDLSSCustomProjectId); - apvSceneBounds = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.apvScenesBounds); + apvScenesData = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.apvScenesData); } void InitializeCustomPostProcessesLists() 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 e2cb48863a2..740e2b8704c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -380,7 +380,7 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) memoryBudget = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeMemoryBudget, probeDebugMesh = defaultResources.assets.probeDebugSphere, probeDebugShader = defaultResources.shaders.probeVolumeDebugShader, - sceneBounds = m_GlobalSettings.GetOrCreateAPVSceneBounds(), + sceneData = m_GlobalSettings.GetOrCreateAPVSceneData(), shBands = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeSHBands }); RegisterRetrieveOfProbeVolumeExtraDataAction(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index d49fc6bc48b..03ccc7d8a31 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -821,16 +821,16 @@ internal bool AddDiffusionProfile(DiffusionProfileSettings profile) #region APV // This is temporarily here until we have a core place to put it shared between pipelines. [SerializeField] - internal ProbeVolumeSceneBounds apvScenesBounds; + internal ProbeVolumeSceneData apvScenesData; - internal ProbeVolumeSceneBounds GetOrCreateAPVSceneBounds() + internal ProbeVolumeSceneData GetOrCreateAPVSceneData() { - if (apvScenesBounds == null) - apvScenesBounds = new ProbeVolumeSceneBounds((Object)this); + if (apvScenesData == null) + apvScenesData = new ProbeVolumeSceneData((Object)this); - apvScenesBounds.SetParentObject((Object)this); - return apvScenesBounds; + apvScenesData.SetParentObject((Object)this); + return apvScenesData; } #endregion From a2fbdf248906a4a94a98b3f49ab366acc0356c99 Mon Sep 17 00:00:00 2001 From: julienamsellem <85612173+julienamsellem@users.noreply.github.com> Date: Fri, 3 Sep 2021 10:46:37 +0200 Subject: [PATCH 072/149] Do not open a VFX Graph editor when an asset is assigned in the inspector (#5502) * Do not open a VFX Graph editor when an asset is assigned in the inspector * Updated changelog * Refined the changelog entry * Updated changelog because this PR fixes two different fogbugz --- com.unity.visualeffectgraph/CHANGELOG.md | 2 ++ .../Editor/Inspector/VisualEffectEditor.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md index 9ed08f5929e..dd834fa5a48 100644 --- a/com.unity.visualeffectgraph/CHANGELOG.md +++ b/com.unity.visualeffectgraph/CHANGELOG.md @@ -101,6 +101,8 @@ The version number for this package has increased due to a version update of a r - Exposed Parameter placement can be moved after sanitize - Fix rendering artifacts on some mobile devices [Case 1149057](https://issuetracker.unity3d.com/product/unity/issues/guid/1149057/) - Fix compilation failure on OpenGLES [Case 1348666](https://issuetracker.unity3d.com/product/unity/issues/guid/1348666/) +- Don't open an empty VFX Graph Editor when assigning a VFX Asset to a Visual Effect GameObject from the inspector [Case 1347399](https://issuetracker.unity3d.com/product/unity/issues/guid/1347399/) +- Visual Effect inspector input fields don't lose focus anymore while typing (Random seed) ## [11.0.0] - 2020-10-21 ### Added diff --git a/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs b/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs index f921f666baa..b388d69c145 100644 --- a/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs +++ b/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs @@ -801,7 +801,7 @@ public override void OnInspectorGUI() EditorGUI.indentLevel = 0; if (serializedObject.ApplyModifiedProperties()) { - var window = EditorWindow.GetWindow(); + var window = WindowLayout.FindEditorWindowOfType(typeof(VFXViewWindow)) as VFXViewWindow; if (window != null) window.OnVisualEffectComponentChanged(targets.Cast()); } From 296ff24f61ab0d4324d1c7ba8e02c1481e9bc7b8 Mon Sep 17 00:00:00 2001 From: Kleber Garcia Date: Fri, 3 Sep 2021 06:38:56 -0400 Subject: [PATCH 073/149] [Fogbugz 1352407] Fixing TAAU and DLSS resolutions on custom post process (#5329) * Fixing TAAU and DLSS resolutions on custom post process by passing custom state * Adding missing flag for dynamic res target * Formatting * Documentation * More docs * changelog * Formatting * Using data instead of passData, this causes a copy of a class resulting in a GCAlloc call --- com.unity.render-pipelines.core/CHANGELOG.md | 1 + .../Runtime/Textures/RTHandle.cs | 27 +++++++++++++++++-- .../CHANGELOG.md | 1 + .../HDRenderPipeline.PostProcess.cs | 24 ++++++++++++++++- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 8bcffaba438..0a34553f239 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -49,6 +49,7 @@ The version number for this package has increased due to a version update of a r - Added an option to change the visibilty of the Volumes Gizmos (Solid, Wireframe, Everything), available at Preferences > Core Render Pipeline - Added class for drawing shadow cascades `UnityEditor.Rendering.ShadowCascadeGUI.DrawShadowCascades`. - Added UNITY_PREV_MATRIX_M and UNITY_PREV_MATRIX_I_M shader macros to support instanced motion vector rendering +- Added new API to customize the rtHandleProperties of a particular RTHandle. This is a temporary work around to assist with viewport setup of Custom post process when dealing with DLSS or TAAU ### Fixed - Help boxes with fix buttons do not crop the label. diff --git a/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs b/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs index 20c8d1e6a06..d66fa0032d9 100644 --- a/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs +++ b/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs @@ -19,6 +19,29 @@ public class RTHandle internal bool m_EnableHWDynamicScale = false; internal string m_Name; + internal bool m_UseCustomHandleScales = false; + internal RTHandleProperties m_CustomHandleProperties; + + /// + /// By default, rtHandleProperties gets the global state of scalers against the global reference mode. + /// This method lets the current RTHandle use a local custom RTHandleProperties. This function is being used + /// by scalers such as TAAU and DLSS, which require to have a different resolution for color (independent of the RTHandleSystem). + /// + /// Properties to set. + public void SetCustomHandleProperties(in RTHandleProperties properties) + { + m_UseCustomHandleScales = true; + m_CustomHandleProperties = properties; + } + + /// + /// Method that clears any custom handle property being set. + /// + public void ClearCustomHandleProperties() + { + m_UseCustomHandleScales = false; + } + /// /// Scale factor applied to the RTHandle reference size. /// @@ -34,9 +57,9 @@ public class RTHandle /// public Vector2Int referenceSize { get; internal set; } /// - /// Current properties of the RTHandle System + /// Current properties of the RTHandle System. If a custom property has been set through SetCustomHandleProperties method, it will be used that one instead. /// - public RTHandleProperties rtHandleProperties { get { return m_Owner.rtHandleProperties; } } + public RTHandleProperties rtHandleProperties { get { return m_UseCustomHandleScales ? m_CustomHandleProperties : m_Owner.rtHandleProperties; } } /// /// RenderTexture associated with the RTHandle /// diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index bf646ec3074..ef3fe3286b0 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -390,6 +390,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) - Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. +- Viewport and scaling of Custom post process when TAAU or DLSS are enabled (case 1352407). ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs index b47ebded31a..253c09549bc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs @@ -1364,6 +1364,8 @@ class CustomPostProcessData public TextureHandle motionVecTexture; public HDCamera hdCamera; public CustomPostProcessVolumeComponent customPostProcess; + public Vector4 postProcessScales; + public Vector2Int postProcessViewportSize; } bool DoCustomPostProcess(RenderGraph renderGraph, HDCamera hdCamera, ref TextureHandle source, TextureHandle depthBuffer, TextureHandle normalBuffer, TextureHandle motionVectors, List postProcessList) @@ -1398,19 +1400,39 @@ bool DoCustomPostProcess(RenderGraph renderGraph, HDCamera hdCamera, ref Texture passData.motionVecTexture = builder.ReadTexture(motionVectors); passData.source = builder.ReadTexture(source); - passData.destination = builder.UseColorBuffer(renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true) + passData.destination = builder.UseColorBuffer(renderGraph.CreateTexture(new TextureDesc(Vector2.one, IsDynamicResUpscaleTargetEnabled(), true) { colorFormat = GetPostprocessTextureFormat(), enableRandomWrite = true, name = "CustomPostProcesDestination" }), 0); passData.hdCamera = hdCamera; passData.customPostProcess = customPP; + passData.postProcessScales = new Vector4(hdCamera.postProcessRTScales.x, hdCamera.postProcessRTScales.y, hdCamera.postProcessRTScalesHistory.x, hdCamera.postProcessRTScalesHistory.y); + passData.postProcessViewportSize = postProcessViewportSize; builder.SetRenderFunc( (CustomPostProcessData data, RenderGraphContext ctx) => { + var srcRt = (RTHandle)data.source; + var dstRt = (RTHandle)data.destination; + + // HACK FIX: for custom post process, we want the user to transparently be able to use color target regardless of the scaling occured. For example, if the user uses any of the HDUtil blit methods + // which require the rtHandleProperties to set the viewport and sample scales. + // In the case of DLSS and TAAU, the post process viewport and size for the color target have changed, thus we override them here. + // When these upscalers arent set, behaviour is still the same (since the post process scale is the same as the global rt handle scale). So for simplicity, we always take this code path for custom post process color. + var newProps = srcRt.rtHandleProperties; + newProps.rtHandleScale = data.postProcessScales; + newProps.currentRenderTargetSize = data.postProcessViewportSize; + newProps.previousRenderTargetSize = data.postProcessViewportSize; + newProps.currentViewportSize = data.postProcessViewportSize; + srcRt.SetCustomHandleProperties(newProps); + dstRt.SetCustomHandleProperties(newProps); + // Temporary: see comment above ctx.cmd.SetGlobalTexture(HDShaderIDs._CameraDepthTexture, data.depthBuffer); ctx.cmd.SetGlobalTexture(HDShaderIDs._NormalBufferTexture, data.normalBuffer); ctx.cmd.SetGlobalTexture(HDShaderIDs._CameraMotionVectorsTexture, data.motionVecTexture); data.customPostProcess.Render(ctx.cmd, data.hdCamera, data.source, data.destination); + + srcRt.ClearCustomHandleProperties(); + dstRt.ClearCustomHandleProperties(); }); customPostProcessExecuted = true; From bf9517249cde7d026724832ff073366bafdde8f5 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Fri, 3 Sep 2021 11:26:21 +0200 Subject: [PATCH 074/149] Fixed obsolete API usage with latest trunk --- .../Runtime/Sky/SkyManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs index 626d7708e9c..bd8156ccc7f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs @@ -537,7 +537,7 @@ internal void SetupAmbientProbe(HDCamera hdCamera) RenderSettings.ambientIntensity = 1.0f; RenderSettings.ambientMode = AmbientMode.Skybox; // Force skybox for our HDRI RenderSettings.reflectionIntensity = 1.0f; - RenderSettings.customReflection = null; + RenderSettings.customReflectionTexture = null; } void BlitCubemap(CommandBuffer cmd, Cubemap source, RenderTexture dest) @@ -1254,7 +1254,7 @@ void OnBakeStarted() RenderSettings.ambientIntensity = 1.0f; RenderSettings.ambientMode = AmbientMode.Skybox; // Force skybox for our HDRI RenderSettings.reflectionIntensity = 1.0f; - RenderSettings.customReflection = null; + RenderSettings.customReflectionTexture = null; DynamicGI.UpdateEnvironment(); } From 3dc324d0154a3cad9c8611c93e973cf81188be16 Mon Sep 17 00:00:00 2001 From: ludovic-theobald <72986299+ludovic-theobald@users.noreply.github.com> Date: Fri, 3 Sep 2021 18:43:29 +0200 Subject: [PATCH 075/149] [VFX][Test] Add HDRP Decal scene to the tests list (#5526) * Add HDRP Decal scene to the tests list * Update 37_DecalsHDRP.png Co-authored-by: Paul Demeulenaere Co-authored-by: Sebastien Lagarde --- .../Linear/OSXEditor/Metal/None/37_DecalsHDRP.png | 4 ++-- .../ProjectSettings/EditorBuildSettings.asset | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/37_DecalsHDRP.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/37_DecalsHDRP.png index afc1f549c80..51b9b995bd3 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/37_DecalsHDRP.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/37_DecalsHDRP.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a11d568173264982bed4124d55bf503d99f10fbf1553c050262462ec1642d3f -size 310999 +oid sha256:9bb46403d67e804cdd80be3aaf47406648dd0963509d48113a1a0286458a2db8 +size 277520 diff --git a/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/EditorBuildSettings.asset b/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/EditorBuildSettings.asset index 4d3eda00bb4..5891ebde96a 100644 --- a/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/EditorBuildSettings.asset @@ -266,4 +266,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/AllTests/VFXTests/GraphicsTests/36_SDFBaker/Scene/36_SkinnedSDF.unity guid: ebaa785ec5cfd50448e6b1fca17c280f + - enabled: 1 + path: Assets/AllTests/VFXTests/GraphicsTests/37_DecalsHDRP/37_DecalsHDRP.unity + guid: b1a2d5cb5366cc14c84167107a4c11c9 m_configObjects: {} From 3efe468ddc17867f0ae0a2b3247cce6c3d83018a Mon Sep 17 00:00:00 2001 From: Adrien de Tocqueville Date: Fri, 3 Sep 2021 19:12:41 +0200 Subject: [PATCH 076/149] Update algorithm for specular occlusion (#5312) * Add two methods for specular occlusion based on spherical gaussians * Add to all lit shaders * Set SG version as default * Update screenshots * dx12 screenshot test * real screenshot * review Co-authored-by: sebastienlagarde --- .../Vulkan/None/1210_Lit_BentNormal.png | 4 +- .../Metal/None/1210_Lit_BentNormal.png | 4 +- .../Direct3D11/None/1210_Lit_BentNormal.png | 4 +- .../Direct3D12/None/1210_Lit_BentNormal.png | 4 +- .../Vulkan/None/1210_Lit_BentNormal.png | 4 +- .../ShaderLibrary/CommonLighting.hlsl | 38 ++++++++++++++++++- .../CHANGELOG.md | 2 +- .../Upgrading-from-2021.1-to-2021.2.md | 5 +++ .../ShaderGraph/TargetData/LightingData.cs | 2 +- .../Material/LayeredLit/LayeredLit.shader | 4 +- .../LayeredLit/LayeredLitTessellation.shader | 2 +- .../Runtime/Material/Lit/Lit.shader | 2 +- .../Runtime/Material/Lit/LitData.hlsl | 7 ---- .../Runtime/Material/Lit/LitProperties.hlsl | 2 + .../Material/Lit/LitTessellation.shader | 2 +- 15 files changed, 60 insertions(+), 26 deletions(-) diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1210_Lit_BentNormal.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1210_Lit_BentNormal.png index 51d7c1faaa8..427e89e5b72 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1210_Lit_BentNormal.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1210_Lit_BentNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdaa894b3cd3a8a6ae48d3cfc20d2068920db6aefc00f40621149647cfc4a9ee -size 174564 +oid sha256:ef77d89a884c94e69c0981c576f7538b8305e69ac0e6d3e33a548207f38ac82c +size 153225 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1210_Lit_BentNormal.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1210_Lit_BentNormal.png index a4789b62f38..d5c04b086da 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1210_Lit_BentNormal.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1210_Lit_BentNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43d968134620179d1a0998174fe208aff8922959dad93d77538cdebb2fbc63db -size 152713 +oid sha256:2a277bafebf1d50f506144f0c18a4448dd3eca2215cf092ba1eb61ff61ee7aff +size 152947 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1210_Lit_BentNormal.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1210_Lit_BentNormal.png index 0bd6dcb3171..0802ee6697b 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1210_Lit_BentNormal.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1210_Lit_BentNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22a865a7db80ef101242ce4f23cf3d846ec542cac7422810ed7424a7351c7f7c -size 153072 +oid sha256:255b0c7bb1445a57659c17f3d7bcc4a05bd5970f19aadaa6c73b0da7e9e83096 +size 153148 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1210_Lit_BentNormal.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1210_Lit_BentNormal.png index 7e770153d4a..6b320949612 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1210_Lit_BentNormal.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1210_Lit_BentNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:638dbedea46a9b053d04bf35f5269631246ab215a606c091f2720e9a1f2867a8 -size 153160 +oid sha256:f60718ffd796662561b9ac0a3d48fa55d3943b09c2ca942e420c6ece8882e9b7 +size 153158 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1210_Lit_BentNormal.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1210_Lit_BentNormal.png index 8cb522aeaf4..427e89e5b72 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1210_Lit_BentNormal.png +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1210_Lit_BentNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7deb071c27433c51b50c915065817b466252555d2e3b9428593eb2acf3183e55 -size 152903 +oid sha256:ef77d89a884c94e69c0981c576f7538b8305e69ac0e6d3e33a548207f38ac82c +size 153225 diff --git a/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl index 05617ac44f4..c9dbf658d2f 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl @@ -245,7 +245,7 @@ real3 GTAOMultiBounce(real visibility, real3 albedo) return max(x, ((x * a + b) * x + c) * x); } -// Based on Oat and Sander's 2008 technique +// Based on Oat and Sander's 2007 technique // Area/solidAngle of intersection of two cone real SphericalCapIntersectionSolidArea(real cosC1, real cosC2, real cosB) { @@ -279,7 +279,7 @@ real SphericalCapIntersectionSolidArea(real cosC1, real cosC2, real cosB) // ref: Practical Realtime Strategies for Accurate Indirect Occlusion // http://blog.selfshadow.com/publications/s2016-shading-course/#course_content // Original Cone-Cone method with cosine weighted assumption (p129 s2016_pbs_activision_occlusion) -real GetSpecularOcclusionFromBentAO(real3 V, real3 bentNormalWS, real3 normalWS, real ambientOcclusion, real roughness) +real GetSpecularOcclusionFromBentAO_ConeCone(real3 V, real3 bentNormalWS, real3 normalWS, real ambientOcclusion, real roughness) { // Retrieve cone angle // Ambient occlusion is cosine weighted, thus use following equation. See slide 129 @@ -290,6 +290,40 @@ real GetSpecularOcclusionFromBentAO(real3 V, real3 bentNormalWS, real3 normalWS, return SphericalCapIntersectionSolidArea(cosAv, cosAs, cosB) / (TWO_PI * (1.0 - cosAs)); } +real GetSpecularOcclusionFromBentAO(real3 V, real3 bentNormalWS, real3 normalWS, real ambientOcclusion, real roughness) +{ + // Pseudo code: + //SphericalGaussian NDF = WarpedGGXDistribution(normalWS, roughness, V); + //SphericalGaussian Visibility = VisibilityConeSG(bentNormalWS, ambientOcclusion); + //SphericalGaussian UpperHemisphere = UpperHemisphereSG(normalWS); + //return saturate( InnerProduct(NDF, Visibility) / InnerProduct(NDF, UpperHemisphere) ); + + // 1. Approximate visibility cone with a spherical gaussian of amplitude A=1 + // For a cone angle X, we can determine sharpness so that all point inside the cone have a value > Y + // sharpness = (log(Y) - log(A)) / (cos(X) - 1) + // For AO cone, cos(X) = sqrt(1 - ambientOcclusion) + // -> for Y = 0.1, sharpness = -1.0 / (sqrt(1-ao) - 1) + float vs = -1.0f / (sqrt(1.0f - ambientOcclusion) - 1.0f); + + // 2. Approximate upper hemisphere with sharpness = 0.8 and amplitude = 1 + float us = 0.8f; + + // 3. Compute warped SG Axis of GGX distribution + // Ref: All-Frequency Rendering of Dynamic, Spatially-Varying Reflectance + // https://www.microsoft.com/en-us/research/wp-content/uploads/2009/12/sg.pdf + float NoV = dot(V, normalWS); + float3 NDFAxis = (2 * NoV * normalWS - V) * (0.5f / max(roughness * roughness * NoV, 0.001f)); + + float umLength1 = length(NDFAxis + vs * bentNormalWS); + float umLength2 = length(NDFAxis + us * normalWS); + float d1 = 1 - exp(-2 * umLength1); + float d2 = 1 - exp(-2 * umLength2); + + float expFactor1 = exp(umLength1 - umLength2 + us - vs); + + return saturate(expFactor1 * (d1 * umLength2) / (d2 * umLength1)); +} + // Ref: Steve McAuley - Energy-Conserving Wrapped Diffuse real ComputeWrappedDiffuseLighting(real NdotL, real w) { diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index ef3fe3286b0..f4b9de12707 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Significantly improved performance of APV probe debug. - Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) - Fixed light anchor min distance value + properties not working with prefabs (case 1345509). +- Fixed specular occlusion sharpness and over darkening at grazing angles. ### changed - Visual Environment ambient mode is now Dynamic by default. @@ -390,7 +391,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) - Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. -- Viewport and scaling of Custom post process when TAAU or DLSS are enabled (case 1352407). ### Changed - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md index e40182b802d..0fa05b8584e 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md @@ -39,6 +39,11 @@ HDRP 2021.2 has various tessellation shader code to enable tessellation support * HDRP has improved support of motion vectors for tessellation. Only `previousPositionRWS` is part of the varyings. HDRP also added the `MotionVectorTessellation()` function. For more information, see the `MotionVectorVertexShaderCommon.hlsl` file. * HDRP now evaluates the `tessellationFactor` in the vertex shader and passes it to the hull shader as an interpolator. For more information, see the `VaryingMesh.hlsl` and `VertMesh.hlsl` files. +### Specular Occlusion + +The algorithm for computing specular occlusion from bent normals and ambient occlusion has been changed to improve visual results. +To use the old algorithm, function calls to `GetSpecularOcclusionFromBentAO` should be replaced by calls to `GetSpecularOcclusionFromBentAO_ConeCone` + ## Density Volumes Density Volumes are now known as **Local Volumetric Fog**. diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs index cd4b56e5a72..0a3878e4caf 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs @@ -74,7 +74,7 @@ public bool specularAA // } [SerializeField] - SpecularOcclusionMode m_SpecularOcclusionMode; + SpecularOcclusionMode m_SpecularOcclusionMode = SpecularOcclusionMode.FromAO; public SpecularOcclusionMode specularOcclusionMode { get => m_SpecularOcclusionMode; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader index e2d674f788f..a28294fda2b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader @@ -244,7 +244,7 @@ Shader "HDRP/LayeredLit" // Following are builtin properties - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, @@ -453,7 +453,7 @@ Shader "HDRP/LayeredLit" #pragma shader_feature_fragment _ENABLESPECULAROCCLUSION // Non-local #pragma shader_feature_fragment _ _SPECULAR_OCCLUSION_NONE _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP // Non-local #pragma shader_feature_raytracing _ENABLESPECULAROCCLUSION // Non-local - #pragma shader_feature_raytracing _ SPECULAR_OCCLUSION_NONE _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP // Non-local + #pragma shader_feature_raytracing _ _SPECULAR_OCCLUSION_NONE _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP // Non-local #ifdef _ENABLESPECULAROCCLUSION #define _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader index ae4b4ceb97b..d79b23c3be1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader @@ -244,7 +244,7 @@ Shader "HDRP/LayeredLitTessellation" // Following are builtin properties - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader index a44fb3837b6..5501967ffcf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader @@ -77,7 +77,7 @@ Shader "HDRP/Lit" // Following options are for the GUI inspector and different from the input parameters above // These option below will cause different compilation flag. - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl index 31cef50350c..729fa81e0b2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl @@ -17,9 +17,6 @@ #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDecalData.hlsl" #endif -//#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/SphericalCapPivot/SPTDistribution.hlsl" -//#define SPECULAR_OCCLUSION_USE_SPTD - //#define PROJECTED_SPACE_NDF_FILTERING // Struct that gather UVMapping info of all layers + common calculation @@ -286,11 +283,7 @@ void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs p // If user provide bent normal then we process a better term #if defined(_BENTNORMALMAP) && defined(_SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP) // If we have bent normal and ambient occlusion, process a specular occlusion - #ifdef SPECULAR_OCCLUSION_USE_SPTD - surfaceData.specularOcclusion = GetSpecularOcclusionFromBentAOPivot(V, bentNormalWS, surfaceData.normalWS, surfaceData.ambientOcclusion, PerceptualSmoothnessToPerceptualRoughness(surfaceData.perceptualSmoothness)); - #else surfaceData.specularOcclusion = GetSpecularOcclusionFromBentAO(V, bentNormalWS, surfaceData.normalWS, surfaceData.ambientOcclusion, PerceptualSmoothnessToRoughness(surfaceData.perceptualSmoothness)); -#endif // Don't do spec occ from Ambient if there is no mask mask #elif defined(_MASKMAP) && !defined(_SPECULAR_OCCLUSION_NONE) surfaceData.specularOcclusion = GetSpecularOcclusionFromAmbientOcclusion(ClampNdotV(dot(surfaceData.normalWS, V)), surfaceData.ambientOcclusion, PerceptualSmoothnessToRoughness(surfaceData.perceptualSmoothness)); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl index d20882376c4..9eed7799baf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl @@ -22,6 +22,8 @@ TEXTURE2D(_MaskMap); SAMPLER(sampler_MaskMap); TEXTURE2D(_BentNormalMap); // Reuse sampler from normal map SAMPLER(sampler_BentNormalMap); +TEXTURE2D(_BentNormalMapOS); +SAMPLER(sampler_BentNormalMapOS); TEXTURE2D(_NormalMap); SAMPLER(sampler_NormalMap); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader index 0ceec482239..ce88d3f398f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader @@ -77,7 +77,7 @@ Shader "HDRP/LitTessellation" // Following options are for the GUI inspector and different from the input parameters above // These option below will cause different compilation flag. - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, From 7c9bf16fc0459279fe12b1b24b9da90bea395059 Mon Sep 17 00:00:00 2001 From: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Date: Fri, 3 Sep 2021 19:20:15 +0200 Subject: [PATCH 077/149] Wrong point (#5530) --- .../Documentation~/Dynamic-Resolution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md b/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md index 130c70aa362..7c5cbf40c6c 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md @@ -95,7 +95,7 @@ HDRP provides the following upscale filter methods: | Catmull-Rom | This upscale filter uses four bilinear samples. This method uses the least resources, but it can cause blurry images after HDRP performs the upscaling step.

This upscale filter has no dependencies and runs at the end of the post-processing pipeline. | | Contrast Adaptive Sharpen (CAS) | This method produces a sharp image with an aggressive sharpening step. Do not use this option when the dynamic resolution screen percentage is less than 50%.
This upscale filter uses **FidelityFX (CAS) AMD™**. For information about FidelityFX and Contrast Adaptive Sharpening, see [AMD FidelityFX](https://www.amd.com/en/technologies/radeon-software-fidelityfx).

This upscale filter has no dependencies and runs at the end of the post-processing pipeline. | | FidelityFX Super Resolution 1.0 | This upscale filter uses a spatial super-resolution method that balances quality and performance. For more information, see [AMD FidelityFX](https://www.amd.com/en/technologies/radeon-software-fidelityfx).

This upscale filter has no dependencies and runs at the end of the post-processing pipeline.
The filter also runs when at 100% resolution as it can have beneficial sharpening effects. | -| Temporal Anti-Aliasing (TAA) Upscale | This upscale filter uses temporal integration to produce a sharp image. This method uses the fewest resources on the GPU.
HDRP executes this upscale filter before post processing and at the same time as the TAA step. This means you can only use the TAA anti-aliasing method. This filter is not compatible with other anti-aliasing methods.

The filter also runs when at 100% resolution when Dynamic Resolution is enabled as it is responsible for anti-aliasing.
More information on [Notes on TAA Upscale](Dynamic-Resolution.md#Notes) section. | +| Temporal Anti-Aliasing (TAA) Upscale | This upscale filter uses temporal integration to produce a sharp image. This method is performance effective as it is performed alongside the normal anti-aliasing.
HDRP executes this upscale filter before post processing and at the same time as the TAA step. This means you can only use the TAA anti-aliasing method. This filter is not compatible with other anti-aliasing methods.

The filter also runs when at 100% resolution when Dynamic Resolution is enabled as it is responsible for anti-aliasing.
More information on [Notes on TAA Upscale](Dynamic-Resolution.md#Notes) section. | You can also override the upscale options in the HDRP asset for each Camera in your scene using code. To do this, call `DynamicResolutionHandler.SetUpscaleFilter(Camera camera, DynamicResUpscaleFilter filter)`, to make HDRP ignore the value in the HDRP Asset for a given camera. From cf0c8429aa17204b864e33db10dc52ec3fd77d8d Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:38 +0000 Subject: [PATCH 078/149] [CI] [trunk] Updated editor to 6dba9a645c429411dfba45edf6f8978f74e8fc16 --- .yamato/_latest_editor_versions_trunk.metafile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 106fb5c9519..2f3527d2e33 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: - updated_at_UTC: '2021-09-02 23:32:10.094863' + updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 234483c68112af95f376bc5820685039f46541f2 - date: '2021-09-02T04:35:04' + id: 6dba9a645c429411dfba45edf6f8978f74e8fc16 + date: '2021-09-04T20:26:00' From 77a0715047b1a5fc7f6d65792628a5d137b2d996 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:39 +0000 Subject: [PATCH 079/149] [CI] [trunk] Updated editor to d91c579900fada424d58738705547e89f87fadfe --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 2f3527d2e33..4654cc164ba 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 6dba9a645c429411dfba45edf6f8978f74e8fc16 - date: '2021-09-04T20:26:00' + id: d91c579900fada424d58738705547e89f87fadfe + date: '2021-09-04T20:27:34' From 959ffe7a047b448958cd9b83cfad802dea1122bb Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:40 +0000 Subject: [PATCH 080/149] [CI] [trunk] Updated editor to 21aaaf09bc028d4abf1595b9cf8548498ddfb82d --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 4654cc164ba..961ed044e0a 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: d91c579900fada424d58738705547e89f87fadfe - date: '2021-09-04T20:27:34' + id: 21aaaf09bc028d4abf1595b9cf8548498ddfb82d + date: '2021-09-04T20:28:16' From fceaa9452f548bc5f33f4b3dee61b43de0d651c6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:42 +0000 Subject: [PATCH 081/149] [CI] [trunk] Updated editor to c9f84ac832a18f3fbf2997327cc1c88e3dbe40a2 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 961ed044e0a..c5f1ece97af 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 21aaaf09bc028d4abf1595b9cf8548498ddfb82d - date: '2021-09-04T20:28:16' + id: c9f84ac832a18f3fbf2997327cc1c88e3dbe40a2 + date: '2021-09-04T20:28:57' From 4ef0b195a12764aa12b8a47739f2f2258ea71631 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:43 +0000 Subject: [PATCH 082/149] [CI] [trunk] Updated editor to c7a229616553611867bd4f45302f869ba6b79efe --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index c5f1ece97af..c6005bd0a73 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: c9f84ac832a18f3fbf2997327cc1c88e3dbe40a2 - date: '2021-09-04T20:28:57' + id: c7a229616553611867bd4f45302f869ba6b79efe + date: '2021-09-04T20:30:25' From a5f194ed6e8563721106ecc62f67ab828dba93c9 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:45 +0000 Subject: [PATCH 083/149] [CI] [trunk] Updated editor to 60b84108d5b21f745aca5265b9fd95118f67a9d8 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index c6005bd0a73..61b3ce55457 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: c7a229616553611867bd4f45302f869ba6b79efe - date: '2021-09-04T20:30:25' + id: 60b84108d5b21f745aca5265b9fd95118f67a9d8 + date: '2021-09-04T20:31:03' From 1d25e73e6a4eb5548b23efef583671eaefd46a50 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:46 +0000 Subject: [PATCH 084/149] [CI] [trunk] Updated editor to a5e80c01477c3f148ab245fe78344a5e94d91ebf --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 61b3ce55457..013072437d0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 60b84108d5b21f745aca5265b9fd95118f67a9d8 - date: '2021-09-04T20:31:03' + id: a5e80c01477c3f148ab245fe78344a5e94d91ebf + date: '2021-09-04T20:36:07' From ba1e816b28d6dbb2c6782f01a44c7cc35c1e9d9a Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:47 +0000 Subject: [PATCH 085/149] [CI] [trunk] Updated editor to 04972f0be17051f1fcfc54578e79c1512dd66a01 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 013072437d0..1169f76c813 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: a5e80c01477c3f148ab245fe78344a5e94d91ebf - date: '2021-09-04T20:36:07' + id: 04972f0be17051f1fcfc54578e79c1512dd66a01 + date: '2021-09-04T20:36:35' From 134d0541572fefbcef1ce6e646e6fc5a2df9d1a3 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:49 +0000 Subject: [PATCH 086/149] [CI] [trunk] Updated editor to 169a32a7ea208a779471804ffd0fcdf8bad14f59 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 1169f76c813..a05f6cbb09f 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 04972f0be17051f1fcfc54578e79c1512dd66a01 - date: '2021-09-04T20:36:35' + id: 169a32a7ea208a779471804ffd0fcdf8bad14f59 + date: '2021-09-04T20:38:06' From c9da9c095ad6cde61b37f9cecac80aadcca980e1 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:50 +0000 Subject: [PATCH 087/149] [CI] [trunk] Updated editor to 08fe854f2756edaebcf48dbaf93795ac00404b99 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index a05f6cbb09f..d00236e637d 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 169a32a7ea208a779471804ffd0fcdf8bad14f59 - date: '2021-09-04T20:38:06' + id: 08fe854f2756edaebcf48dbaf93795ac00404b99 + date: '2021-09-04T20:39:48' From d238dd6c9e375a56fc1e6672ef9db9b07b91a1f6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:51 +0000 Subject: [PATCH 088/149] [CI] [trunk] Updated editor to b900f4b4fd780f60b7bec4c3b18e4642f63a9384 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d00236e637d..d3403e6939e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 08fe854f2756edaebcf48dbaf93795ac00404b99 - date: '2021-09-04T20:39:48' + id: b900f4b4fd780f60b7bec4c3b18e4642f63a9384 + date: '2021-09-04T20:40:16' From ab5b1d08dc6aef18b54580258dff135342f99e75 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:53 +0000 Subject: [PATCH 089/149] [CI] [trunk] Updated editor to e51cafcf26ad0e8df65ccbfe9ccf1a7d80917d15 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d3403e6939e..429b3ce1c7d 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: b900f4b4fd780f60b7bec4c3b18e4642f63a9384 - date: '2021-09-04T20:40:16' + id: e51cafcf26ad0e8df65ccbfe9ccf1a7d80917d15 + date: '2021-09-04T20:40:43' From c91cbdcdffdfc4434fc107e8397f6171028f2252 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:54 +0000 Subject: [PATCH 090/149] [CI] [trunk] Updated editor to d7749ce75b80450c8f9dc3ab9595e8b15b490de8 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 429b3ce1c7d..a0f35ad9c0b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: e51cafcf26ad0e8df65ccbfe9ccf1a7d80917d15 - date: '2021-09-04T20:40:43' + id: d7749ce75b80450c8f9dc3ab9595e8b15b490de8 + date: '2021-09-04T20:42:17' From 53c8be988eb9791dd70af486a2266f81cb4df5b6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:55 +0000 Subject: [PATCH 091/149] [CI] [trunk] Updated editor to b1ce4a3b3f0357502f7976fcbdd8642d7f9378c3 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index a0f35ad9c0b..c5d9f569d00 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: d7749ce75b80450c8f9dc3ab9595e8b15b490de8 - date: '2021-09-04T20:42:17' + id: b1ce4a3b3f0357502f7976fcbdd8642d7f9378c3 + date: '2021-09-04T20:43:48' From 61d129ef9fcc752e5c9376f0d3b924b2384f0bd8 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:57 +0000 Subject: [PATCH 092/149] [CI] [trunk] Updated editor to a450e16a8d01f9b15d507f7c9b36202bb2e11054 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index c5d9f569d00..0376c7b0153 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: b1ce4a3b3f0357502f7976fcbdd8642d7f9378c3 - date: '2021-09-04T20:43:48' + id: a450e16a8d01f9b15d507f7c9b36202bb2e11054 + date: '2021-09-04T20:44:28' From f804ae76ee55abe8bfed17fed712b3b77377f739 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:31:58 +0000 Subject: [PATCH 093/149] [CI] [trunk] Updated editor to ecd503236c60c88f70806ec3fb60deb66a9f4f43 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 0376c7b0153..36b81ad79a6 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: a450e16a8d01f9b15d507f7c9b36202bb2e11054 - date: '2021-09-04T20:44:28' + id: ecd503236c60c88f70806ec3fb60deb66a9f4f43 + date: '2021-09-04T20:46:09' From 2f3b1d3a7e74e8650a18457d04e5613152b32704 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:00 +0000 Subject: [PATCH 094/149] [CI] [trunk] Updated editor to 4b14058a9f8fc465abc612cd4419e197d251591a --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 36b81ad79a6..9b410a3f1e5 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: ecd503236c60c88f70806ec3fb60deb66a9f4f43 - date: '2021-09-04T20:46:09' + id: 4b14058a9f8fc465abc612cd4419e197d251591a + date: '2021-09-04T20:46:54' From c0f2b87d95d9f1799bf9206475fa1adb53818067 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:01 +0000 Subject: [PATCH 095/149] [CI] [trunk] Updated editor to 7db7061572840dee2a72e12ccdddc57da045e9c6 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 9b410a3f1e5..a0f431a81d1 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 4b14058a9f8fc465abc612cd4419e197d251591a - date: '2021-09-04T20:46:54' + id: 7db7061572840dee2a72e12ccdddc57da045e9c6 + date: '2021-09-04T20:47:38' From 6e22dc79922c7752f8c6ff3ba5609c2068626d42 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:03 +0000 Subject: [PATCH 096/149] [CI] [trunk] Updated editor to b17aecb184f7091ecfccb7c3d40fdd608a492694 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index a0f431a81d1..22dfb6ce111 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 7db7061572840dee2a72e12ccdddc57da045e9c6 - date: '2021-09-04T20:47:38' + id: b17aecb184f7091ecfccb7c3d40fdd608a492694 + date: '2021-09-04T20:48:16' From 7bc1d0a1a1241a55767d5c4ee417ae79f414b62d Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:04 +0000 Subject: [PATCH 097/149] [CI] [trunk] Updated editor to a93665682a11ac50dcc2902a127bec11a933a1a0 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 22dfb6ce111..d643566928b 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: b17aecb184f7091ecfccb7c3d40fdd608a492694 - date: '2021-09-04T20:48:16' + id: a93665682a11ac50dcc2902a127bec11a933a1a0 + date: '2021-09-04T20:48:43' From 58d7daa5c16ae311388d8e4096232a33cea7ddfa Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:06 +0000 Subject: [PATCH 098/149] [CI] [trunk] Updated editor to 80a5ef0e4f11dba5ab7ca00dde5d445d71a59070 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d643566928b..611b192ebb8 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: a93665682a11ac50dcc2902a127bec11a933a1a0 - date: '2021-09-04T20:48:43' + id: 80a5ef0e4f11dba5ab7ca00dde5d445d71a59070 + date: '2021-09-04T20:49:12' From fcb86fad357dd81d7cf2d8e2c655d0e299adf479 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:07 +0000 Subject: [PATCH 099/149] [CI] [trunk] Updated editor to 8250a14f2e64a42bad1447ba016a6360c5865cf2 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 611b192ebb8..92dbbe417dd 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 80a5ef0e4f11dba5ab7ca00dde5d445d71a59070 - date: '2021-09-04T20:49:12' + id: 8250a14f2e64a42bad1447ba016a6360c5865cf2 + date: '2021-09-04T20:50:44' From 82fc901ef63a825a4271cfe52d31fb2f5a27ccd5 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:09 +0000 Subject: [PATCH 100/149] [CI] [trunk] Updated editor to 1c81d4adae30fab6115cda23d725f8d4099bb096 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 92dbbe417dd..d9d5bf5a053 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 8250a14f2e64a42bad1447ba016a6360c5865cf2 - date: '2021-09-04T20:50:44' + id: 1c81d4adae30fab6115cda23d725f8d4099bb096 + date: '2021-09-04T20:51:14' From a77c5dcad64ccaccb0820e57860187a5c8faefb2 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:10 +0000 Subject: [PATCH 101/149] [CI] [trunk] Updated editor to 0af4d2574ed1c7f22b94224a3f8b699f1b0ae116 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d9d5bf5a053..d0a8651d396 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 1c81d4adae30fab6115cda23d725f8d4099bb096 - date: '2021-09-04T20:51:14' + id: 0af4d2574ed1c7f22b94224a3f8b699f1b0ae116 + date: '2021-09-04T20:52:49' From 2ff4cf0f8e4680902b5f870acd329fa6ba53ffe1 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:11 +0000 Subject: [PATCH 102/149] [CI] [trunk] Updated editor to b56c7f5e88cd76d31a66a6d412e78446cb2652f4 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d0a8651d396..c19a2490cfe 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 0af4d2574ed1c7f22b94224a3f8b699f1b0ae116 - date: '2021-09-04T20:52:49' + id: b56c7f5e88cd76d31a66a6d412e78446cb2652f4 + date: '2021-09-04T20:54:33' From 32b09b7d0328890682956e51c7ea5ec54363a3af Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:13 +0000 Subject: [PATCH 103/149] [CI] [trunk] Updated editor to 4aff0afcf51ddcfa35aac7613034d1bfa59bc679 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index c19a2490cfe..d6cea313595 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: b56c7f5e88cd76d31a66a6d412e78446cb2652f4 - date: '2021-09-04T20:54:33' + id: 4aff0afcf51ddcfa35aac7613034d1bfa59bc679 + date: '2021-09-04T20:55:00' From f174356e933da857a610973a9110ce4095610b51 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:14 +0000 Subject: [PATCH 104/149] [CI] [trunk] Updated editor to 4c70fc42773339b8793323e3e8ef6dbd1a977635 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d6cea313595..33cdb9dfe28 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 4aff0afcf51ddcfa35aac7613034d1bfa59bc679 - date: '2021-09-04T20:55:00' + id: 4c70fc42773339b8793323e3e8ef6dbd1a977635 + date: '2021-09-04T20:56:28' From dd0797884f0717c87e8c6d5ecafac65a28c2220b Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:16 +0000 Subject: [PATCH 105/149] [CI] [trunk] Updated editor to c1f072d8be52dc2629276170f52a91e7ea2861d1 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 33cdb9dfe28..374059adb57 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 4c70fc42773339b8793323e3e8ef6dbd1a977635 - date: '2021-09-04T20:56:28' + id: c1f072d8be52dc2629276170f52a91e7ea2861d1 + date: '2021-09-04T20:57:54' From cee2108d4be9761f65bc0f585884c35ff3d67711 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:17 +0000 Subject: [PATCH 106/149] [CI] [trunk] Updated editor to b3de5a27ecbf2c6440145b350e517dbba65b11ee --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 374059adb57..992c5fc23ec 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: c1f072d8be52dc2629276170f52a91e7ea2861d1 - date: '2021-09-04T20:57:54' + id: b3de5a27ecbf2c6440145b350e517dbba65b11ee + date: '2021-09-04T20:59:21' From f93822ffdc0b1cbb8264b615334ca4a9caf8e14d Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:19 +0000 Subject: [PATCH 107/149] [CI] [trunk] Updated editor to 07c9d6ecb4f0f04b273978d58c8a1843bb5ac82b --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 992c5fc23ec..e674654a266 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: b3de5a27ecbf2c6440145b350e517dbba65b11ee - date: '2021-09-04T20:59:21' + id: 07c9d6ecb4f0f04b273978d58c8a1843bb5ac82b + date: '2021-09-04T21:00:48' From c82597202998d930734d83e6fcf7857778416d21 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:20 +0000 Subject: [PATCH 108/149] [CI] [trunk] Updated editor to c3c0b94db9f039ceb9cb42ea426f6980d3f854a4 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index e674654a266..d9a5b7692ab 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 07c9d6ecb4f0f04b273978d58c8a1843bb5ac82b - date: '2021-09-04T21:00:48' + id: c3c0b94db9f039ceb9cb42ea426f6980d3f854a4 + date: '2021-09-04T21:02:14' From 1e46c547d8f2452a5fb7c6bedfb0064ab3f59431 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:21 +0000 Subject: [PATCH 109/149] [CI] [trunk] Updated editor to 102b84a86f7117bb0f7e6149ea11dc04035652e8 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d9a5b7692ab..d99b0a105d9 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: c3c0b94db9f039ceb9cb42ea426f6980d3f854a4 - date: '2021-09-04T21:02:14' + id: 102b84a86f7117bb0f7e6149ea11dc04035652e8 + date: '2021-09-04T21:02:50' From c34df783da993625c6b3f703cb4857722596f055 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:23 +0000 Subject: [PATCH 110/149] [CI] [trunk] Updated editor to 042de79d18b17667ca407d6b757d9f7ecbcd0f39 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index d99b0a105d9..2a36df85377 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 102b84a86f7117bb0f7e6149ea11dc04035652e8 - date: '2021-09-04T21:02:50' + id: 042de79d18b17667ca407d6b757d9f7ecbcd0f39 + date: '2021-09-04T21:03:18' From 0dbc77ac86123a4bebfa549a7653b87404e6eb26 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:24 +0000 Subject: [PATCH 111/149] [CI] [trunk] Updated editor to 9149694eb990a3a935aba958d2da8ce39bbbbd2b --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 2a36df85377..22b4587eb5e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 042de79d18b17667ca407d6b757d9f7ecbcd0f39 - date: '2021-09-04T21:03:18' + id: 9149694eb990a3a935aba958d2da8ce39bbbbd2b + date: '2021-09-04T21:04:09' From fed8c56d0277dd777a78d2872d4dc736fd7fd5d6 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:26 +0000 Subject: [PATCH 112/149] [CI] [trunk] Updated editor to 032009bddc1118740896afb34bda8b8098022266 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 22b4587eb5e..2f50aecb1f0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 9149694eb990a3a935aba958d2da8ce39bbbbd2b - date: '2021-09-04T21:04:09' + id: 032009bddc1118740896afb34bda8b8098022266 + date: '2021-09-04T21:04:38' From 8427c877b5672a0855e2e4eeb51d0a011c0e4be1 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:27 +0000 Subject: [PATCH 113/149] [CI] [trunk] Updated editor to f0602d05bea479c531551bed09f50189549ef699 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 2f50aecb1f0..18b80d6571e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 032009bddc1118740896afb34bda8b8098022266 - date: '2021-09-04T21:04:38' + id: f0602d05bea479c531551bed09f50189549ef699 + date: '2021-09-04T21:05:04' From a8d84cdcf7d7092e322e670053ff8aba0e3377d5 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:29 +0000 Subject: [PATCH 114/149] [CI] [trunk] Updated editor to 0b6e31694c28cd96bb13bc0e20038db7a0a6d991 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 18b80d6571e..1e80e94c63f 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: f0602d05bea479c531551bed09f50189549ef699 - date: '2021-09-04T21:05:04' + id: 0b6e31694c28cd96bb13bc0e20038db7a0a6d991 + date: '2021-09-04T21:07:01' From 3434f3a7d1098e734168683b5f3920e0a4963820 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:30 +0000 Subject: [PATCH 115/149] [CI] [trunk] Updated editor to bc371003afd2b63c9b2eee041d3caed6e666974a --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 1e80e94c63f..012ad3540b0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 0b6e31694c28cd96bb13bc0e20038db7a0a6d991 - date: '2021-09-04T21:07:01' + id: bc371003afd2b63c9b2eee041d3caed6e666974a + date: '2021-09-04T21:08:38' From 7e53a091574f2db8c28e80844a321939b0491e03 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:31 +0000 Subject: [PATCH 116/149] [CI] [trunk] Updated editor to 271225ea079da1855dce98ac6565fec4235b204a --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 012ad3540b0..57d02ed66a0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: bc371003afd2b63c9b2eee041d3caed6e666974a - date: '2021-09-04T21:08:38' + id: 271225ea079da1855dce98ac6565fec4235b204a + date: '2021-09-04T21:10:26' From 640bc5357ac995016e2087a1b2bbe15ae8733140 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Sat, 4 Sep 2021 23:32:33 +0000 Subject: [PATCH 117/149] [CI] [trunk] Updated editor to a6d7f27874c08c403d43e993bde1b93ce0ea2161 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 57d02ed66a0..02c441f40a1 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-04 23:31:29.876736' changeset: - id: 271225ea079da1855dce98ac6565fec4235b204a - date: '2021-09-04T21:10:26' + id: a6d7f27874c08c403d43e993bde1b93ce0ea2161 + date: '2021-09-04T21:12:24' From 4b19dd147a1fc97cc8a887d1a575a5d8d974478f Mon Sep 17 00:00:00 2001 From: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:42:05 +0200 Subject: [PATCH 118/149] XPipeline - Sharing styles across Light Inspectors (#5402) --- .../Editor/CoreEditorStyles.cs | 5 +++ .../Editor/Lighting/LightUI.Skin.cs | 41 +++++++++++++++++++ .../Editor/Lighting/LightUI.Skin.cs.meta | 11 +++++ .../Editor/Lighting/HDLightUI.Skin.cs | 13 ------ .../Editor/Lighting/HDLightUI.cs | 35 ++++++++-------- .../UniversalRenderPipelineLightUI.Drawers.cs | 25 ++++++----- ...alRenderPipelineLightUI.PresetInspector.cs | 6 +-- .../UniversalRenderPipelineLightUI.Skin.cs | 14 +------ 8 files changed, 90 insertions(+), 60 deletions(-) create mode 100644 com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs create mode 100644 com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta diff --git a/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs b/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs index 0641cc62b3a..044bbf1f2c7 100644 --- a/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs +++ b/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs @@ -169,6 +169,11 @@ internal static Texture2D GetMessageTypeIcon(MessageType messageType) /// Reset All content public static readonly GUIContent resetAllButtonLabel = EditorGUIUtility.TrTextContent("Reset All"); + /// + /// Empty space content in case that you want to keep the indentation but have nothing to write + /// + public static readonly GUIContent empty = EditorGUIUtility.TrTextContent(" "); + #endregion static CoreEditorStyles() diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs new file mode 100644 index 00000000000..688576417c9 --- /dev/null +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs @@ -0,0 +1,41 @@ +using UnityEngine; + +namespace UnityEditor.Rendering +{ + /// + /// Contains a set of methods to help render the inspectors of Lights across SRP's + /// + public partial class LightUI + { + /// + /// Styles + /// + public static class Styles + { + public static readonly GUIContent generalHeader = EditorGUIUtility.TrTextContent("General"); + public static readonly GUIContent shapeHeader = EditorGUIUtility.TrTextContent("Shape"); + public static readonly GUIContent renderingHeader = EditorGUIUtility.TrTextContent("Rendering"); + public static readonly GUIContent emissionHeader = EditorGUIUtility.TrTextContent("Emission"); + public static readonly GUIContent shadowHeader = EditorGUIUtility.TrTextContent("Shadows"); + + public static readonly GUIContent lightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags."); + + // Emission + public static readonly GUIContent color = EditorGUIUtility.TrTextContent("Color", "Specifies the color this Light emits."); + public static readonly GUIContent lightAppearance = EditorGUIUtility.TrTextContent("Light Appearance", "Specifies the mode for this Light's color is calculated."); + public static readonly GUIContent[] lightAppearanceOptions = new[] + { + EditorGUIUtility.TrTextContent("Color"), + EditorGUIUtility.TrTextContent("Filter and Temperature") + }; + public static readonly GUIContent[] lightAppearanceUnits = new[] + { + EditorGUIUtility.TrTextContent("Kelvin") + }; + public static readonly GUIContent colorFilter = EditorGUIUtility.TrTextContent("Filter", "Specifies a color which tints the Light source."); + public static readonly GUIContent colorTemperature = EditorGUIUtility.TrTextContent("Temperature", "Specifies a temperature (in Kelvin) used to correlate a color for the Light. For reference, White is 6500K."); + + public static readonly string unsupportedPresetPropertiesMessage = L10n.Tr("When using Preset of Light Component, only a subset of properties are supported. Unsupported properties are hidden."); + } + } +} diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta new file mode 100644 index 00000000000..650481f892f --- /dev/null +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 57198e360c6d9454b831562cef29b556 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs index 7819af246fb..f7a19f084ca 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs @@ -9,12 +9,8 @@ partial class HDLightUI sealed class Styles { // Headers - public readonly GUIContent generalHeader = EditorGUIUtility.TrTextContent("General"); - public readonly GUIContent shapeHeader = EditorGUIUtility.TrTextContent("Shape"); public readonly GUIContent celestialBodyHeader = EditorGUIUtility.TrTextContent("Celestial Body"); - public readonly GUIContent emissionHeader = EditorGUIUtility.TrTextContent("Emission"); public readonly GUIContent volumetricHeader = EditorGUIUtility.TrTextContent("Volumetrics"); - public readonly GUIContent shadowHeader = EditorGUIUtility.TrTextContent("Shadows"); public readonly GUIContent shadowMapSubHeader = EditorGUIUtility.TrTextContent("Shadow Map"); public readonly GUIContent contactShadowsSubHeader = EditorGUIUtility.TrTextContent("Contact Shadows"); public readonly GUIContent bakedShadowsSubHeader = EditorGUIUtility.TrTextContent("Baked Shadows"); @@ -32,10 +28,6 @@ sealed class Styles public readonly GUIContent bakedShadowRadius = EditorGUIUtility.TrTextContent("Radius", "Sets the amount of artificial softening the baking process applies to the edges of shadows cast by this Point or Spot Light."); public readonly GUIContent bakedShadowAngle = EditorGUIUtility.TrTextContent("Angle", "Controls the amount of artificial softening the baking process applies to the edges of shadows cast by Directional Lights."); public readonly GUIContent lightBounceIntensity = EditorGUIUtility.TrTextContent("Indirect Multiplier", "Controls the intensity of the indirect light this Light contributes to the Scene. A value of 0 with a Realtime Light causes HDRP to remove it from realtime global illumination. A value of 0 for Baked and Mixed Lights cause them to no longer emit indirect lighting. This has no effect if you disable both Realtime and Baked global illumination."); - public readonly GUIContent color = EditorGUIUtility.TrTextContent("Color", "Specifies the color this Light emits."); - public readonly GUIContent lightAppearance = EditorGUIUtility.TrTextContent("Light Appearance", "Specifies the mode for how HDRP calculates this Light's color."); - public readonly GUIContent colorFilter = EditorGUIUtility.TrTextContent("Filter", "Specifies a color which tints the Light source."); - public readonly GUIContent colorTemperature = EditorGUIUtility.TrTextContent("Temperature", "Specifies a temperature (in Kelvin) HDRP uses to correlate a color for the Light. For reference, White is 6500K."); public readonly GUIContent areaLightCookie = EditorGUIUtility.TrTextContent("Cookie", "Cookie mask currently assigned to the area light."); public readonly GUIContent iesTexture = EditorGUIUtility.TrTextContent("IES Profile", "IES Profile (Support: Point, Spot, Rectangular-Area Lights)."); public readonly GUIContent cookieTextureTypeError = EditorGUIUtility.TrTextContent("HDRP does not support the Cookie Texture type, only Default is supported.", EditorGUIUtility.IconContent("console.warnicon").image); @@ -50,9 +42,6 @@ sealed class Styles public readonly GUIContent areaIntensity = EditorGUIUtility.TrTextContent("Intensity (Lumen)", "Luminous power of the Light in Lumen."); public readonly GUIContent lightIntensity = EditorGUIUtility.TrTextContent("Intensity", "Sets the strength of the Light. Use the drop-down to select the light units to use."); - // in case that you want to keep the indentation but have nothing to write - public readonly GUIContent empty = EditorGUIUtility.TrTextContent(" "); - public readonly GUIContent lightRadius = EditorGUIUtility.TrTextContent("Radius", "Sets the radius of the light source. This affects the falloff of diffuse lighting, the spread of the specular highlight, and the softness of Ray Traced shadows."); public readonly GUIContent affectDiffuse = EditorGUIUtility.TrTextContent("Affect Diffuse", "When disabled, HDRP does not calculate diffuse lighting for this Light. Does not increase performance as HDRP still calculates the diffuse lighting."); public readonly GUIContent affectSpecular = EditorGUIUtility.TrTextContent("Affect Specular", "When disabled, HDRP does not calculate specular lighting for this Light. Does not increase performance as HDRP still calculates the specular lighting."); @@ -83,7 +72,6 @@ sealed class Styles public readonly GUIContent areaLightEmissiveMeshMotionVector = EditorGUIUtility.TrTextContent("Motion Vectors", "Specify wether the generated Mesh renders 'Per Object Motion', 'Camera Motion' or 'No Motion' vectors to the Camera Motion Vector Texture."); public readonly GUIContent areaLightEmissiveMeshSameLayer = EditorGUIUtility.TrTextContent("Same Layer", "If checked, use the same Layer than the Light one."); public readonly GUIContent areaLightEmissiveMeshCustomLayer = EditorGUIUtility.TrTextContent("Custom Layer", "Specify on which layer the generated Mesh live."); - public readonly GUIContent lightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags."); public readonly GUIContent interactsWithSky = EditorGUIUtility.TrTextContent("Affect Physically Based Sky", "Check this option to make the light and the Physically Based sky affect one another."); public readonly GUIContent angularDiameter = EditorGUIUtility.TrTextContent("Angular Diameter", "Angular diameter of the emissive celestial body represented by the light as seen from the camera (in degrees). Used to render the sun/moon disk."); @@ -159,7 +147,6 @@ sealed class Styles // Warnings public readonly string unsupportedLightShapeWarning = L10n.Tr("This light shape is not supported by Realtime Global Illumination."); - public readonly string unsupportedPresetPropertiesMessage = L10n.Tr("When using Preset of Light Component, only a subset of properties are supported. Unsupported properties are hidden."); } static Styles s_Styles = new Styles(); diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs index 211bf2a6876..a44120089c3 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs @@ -87,12 +87,12 @@ internal static void SetAdditionalPropertiesVisibility(bool value) static HDLightUI() { Inspector = CED.Group( - CED.AdditionalPropertiesFoldoutGroup(s_Styles.generalHeader, Expandable.General, k_ExpandedState, AdditionalProperties.General, k_AdditionalPropertiesState, + CED.AdditionalPropertiesFoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedState, AdditionalProperties.General, k_AdditionalPropertiesState, CED.Group((serialized, owner) => DrawGeneralContent(serialized, owner)), DrawGeneralAdditionalContent), - CED.FoldoutGroup(s_Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawShapeContent), + CED.FoldoutGroup(LightUI.Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawShapeContent), CED.Conditional((serialized, owner) => serialized.type == HDLightType.Directional && !serialized.settings.isCompletelyBaked, CED.FoldoutGroup(s_Styles.celestialBodyHeader, Expandable.CelestialBody, k_ExpandedState, DrawCelestialBodyContent)), - CED.AdditionalPropertiesFoldoutGroup(s_Styles.emissionHeader, Expandable.Emission, k_ExpandedState, AdditionalProperties.Emission, k_AdditionalPropertiesState, + CED.AdditionalPropertiesFoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedState, AdditionalProperties.Emission, k_AdditionalPropertiesState, CED.Group( DrawColor, DrawLightIntensityGUILayout, @@ -106,7 +106,7 @@ static HDLightUI() return type != HDLightType.Area || type == HDLightType.Area && serialized.areaLightShape != AreaLightShape.Tube; }, CED.TernaryConditional((serialized, owner) => !serialized.settings.isCompletelyBaked, - CED.AdditionalPropertiesFoldoutGroup(s_Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, AdditionalProperties.Shadow, k_AdditionalPropertiesState, + CED.AdditionalPropertiesFoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, AdditionalProperties.Shadow, k_AdditionalPropertiesState, CED.Group( CED.Group( CED.AdditionalPropertiesFoldoutGroup(s_Styles.shadowMapSubHeader, Expandable.ShadowMap, k_ExpandedState, AdditionalProperties.Shadow, k_AdditionalPropertiesState, @@ -126,7 +126,7 @@ static HDLightUI() ), CED.noop //will only add parameter in first sub header ), - CED.FoldoutGroup(s_Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, + CED.FoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, CED.FoldoutGroup(s_Styles.bakedShadowsSubHeader, Expandable.BakedShadow, k_ExpandedState, FoldoutOption.SubFoldout | FoldoutOption.Indent | FoldoutOption.NoSpaceAtEnd, DrawBakedShadowsContent)) ) ) @@ -134,11 +134,11 @@ static HDLightUI() PresetInspector = CED.Group( CED.Group((serialized, owner) => - EditorGUILayout.HelpBox(s_Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), + EditorGUILayout.HelpBox(LightUI.Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), CED.Group((serialized, owner) => EditorGUILayout.Space()), - CED.FoldoutGroup(s_Styles.generalHeader, Expandable.General, k_ExpandedStatePreset, CED.Group((serialized, owner) => DrawGeneralContent(serialized, owner, true))), - CED.FoldoutGroup(s_Styles.emissionHeader, Expandable.Emission, k_ExpandedStatePreset, CED.Group(DrawColor, DrawEmissionContent)), - CED.FoldoutGroup(s_Styles.shadowHeader, Expandable.Shadows, k_ExpandedStatePreset, DrawEnableShadowMapInternal) + CED.FoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedStatePreset, CED.Group((serialized, owner) => DrawGeneralContent(serialized, owner, true))), + CED.FoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedStatePreset, CED.Group(DrawColor, DrawEmissionContent)), + CED.FoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedStatePreset, DrawEnableShadowMapInternal) ); Type lightMappingType = typeof(Lightmapping); @@ -253,7 +253,7 @@ static void DrawGeneralAdditionalContent(SerializedHDLight serialized, Editor ow { using (var change = new EditorGUI.ChangeCheckScope()) { - EditorGUILayout.PropertyField(serialized.lightlayersMask, s_Styles.lightLayer); + EditorGUILayout.PropertyField(serialized.lightlayersMask, LightUI.Styles.lightLayer); if (change.changed && serialized.linkShadowLayers.boolValue) SyncLightAndShadowLayers(serialized, owner); } @@ -657,7 +657,7 @@ static void DrawLightIntensityGUILayout(SerializedHDLight serialized, Editor own // Draw the unit textfield EditorGUI.BeginChangeCheck(); - EditorGUI.PropertyField(valueRect, serialized.intensity, s_Styles.empty); + EditorGUI.PropertyField(valueRect, serialized.intensity, CoreEditorStyles.empty); DrawLightIntensityUnitPopup(unitRect, serialized, owner); if (EditorGUI.EndChangeCheck()) @@ -672,21 +672,20 @@ static void DrawColor(SerializedHDLight serialized, Editor owner) { // Use the color temperature bool to create a popup dropdown to choose between the two modes. var colorTemperaturePopupValue = Convert.ToInt32(serialized.settings.useColorTemperature.boolValue); - var lightAppearanceOptions = new[] { "Color", "Filter and Temperature" }; - colorTemperaturePopupValue = EditorGUILayout.Popup(s_Styles.lightAppearance, colorTemperaturePopupValue, lightAppearanceOptions); + colorTemperaturePopupValue = EditorGUILayout.Popup(LightUI.Styles.lightAppearance, colorTemperaturePopupValue, LightUI.Styles.lightAppearanceOptions); serialized.settings.useColorTemperature.boolValue = Convert.ToBoolean(colorTemperaturePopupValue); if (serialized.settings.useColorTemperature.boolValue) { EditorGUI.indentLevel += 1; - EditorGUILayout.PropertyField(serialized.settings.color, s_Styles.colorFilter); + EditorGUILayout.PropertyField(serialized.settings.color, LightUI.Styles.colorFilter); // Light unit slider const int k_ValueUnitSeparator = 2; var lineRect = EditorGUILayout.GetControlRect(); var labelRect = lineRect; labelRect.width = EditorGUIUtility.labelWidth; - EditorGUI.LabelField(labelRect, s_Styles.colorTemperature); + EditorGUI.LabelField(labelRect, LightUI.Styles.colorTemperature); var temperatureSliderRect = lineRect; temperatureSliderRect.x += EditorGUIUtility.labelWidth + k_ValueUnitSeparator; @@ -704,16 +703,16 @@ static void DrawColor(SerializedHDLight serialized, Editor owner) unitRect.x += valueRect.width - indent + k_ValueUnitSeparator; unitRect.width = k_UnitWidth + .5f; - EditorGUI.PropertyField(valueRect, serialized.settings.colorTemperature, s_Styles.empty); + EditorGUI.PropertyField(valueRect, serialized.settings.colorTemperature, CoreEditorStyles.empty); EditorGUI.Popup(unitRect, 0, new[] { "Kelvin" }); EditorGUI.indentLevel -= 1; } else - EditorGUILayout.PropertyField(serialized.settings.color, s_Styles.color); + EditorGUILayout.PropertyField(serialized.settings.color, LightUI.Styles.color); } else - EditorGUILayout.PropertyField(serialized.settings.color, s_Styles.color); + EditorGUILayout.PropertyField(serialized.settings.color, LightUI.Styles.color); } static void DrawEmissionContent(SerializedHDLight serialized, Editor owner) diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs index 13381cfa3f3..8ebb1173053 100644 --- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs +++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs @@ -40,13 +40,13 @@ enum Expandable return !sceneLighting; }, (_, __) => EditorGUILayout.HelpBox(Styles.DisabledLightWarning.text, MessageType.Warning)), - CED.FoldoutGroup(Styles.generalHeader, + CED.FoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedState, DrawGeneralContent), CED.Conditional( (serializedLight, editor) => !serializedLight.settings.lightType.hasMultipleDifferentValues && serializedLight.settings.light.type == LightType.Spot, - CED.FoldoutGroup(Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawSpotShapeContent)), + CED.FoldoutGroup(LightUI.Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawSpotShapeContent)), CED.Conditional( (serializedLight, editor) => { @@ -55,16 +55,16 @@ enum Expandable var lightType = serializedLight.settings.light.type; return lightType == LightType.Rectangle || lightType == LightType.Disc; }, - CED.FoldoutGroup(Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawAreaShapeContent)), - CED.FoldoutGroup(Styles.emissionHeader, + CED.FoldoutGroup(LightUI.Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawAreaShapeContent)), + CED.FoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedState, CED.Group(DrawerColor, DrawEmissionContent)), - CED.FoldoutGroup(Styles.renderingHeader, + CED.FoldoutGroup(LightUI.Styles.renderingHeader, Expandable.Rendering, k_ExpandedState, DrawRenderingContent), - CED.FoldoutGroup(Styles.shadowHeader, + CED.FoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, DrawShadowsContent), @@ -170,7 +170,7 @@ static void DrawGeneralContentInternal(UniversalRenderPipelineSerializedLight se if (lightType != LightType.Rectangle && !serializedLight.settings.isCompletelyBaked && UniversalRenderPipeline.asset.supportsLightLayers && !isInPreset) { EditorGUI.BeginChangeCheck(); - DrawLightLayerMask(serializedLight.lightLayerMask, Styles.LightLayer); + DrawLightLayerMask(serializedLight.lightLayerMask, LightUI.Styles.lightLayer); if (EditorGUI.EndChangeCheck()) { if (!serializedLight.customShadowLayers.boolValue) @@ -253,23 +253,22 @@ static void DrawerColor(UniversalRenderPipelineSerializedLight serializedLight, { // Use the color temperature bool to create a popup dropdown to choose between the two modes. var colorTemperaturePopupValue = Convert.ToInt32(serializedLight.settings.useColorTemperature.boolValue); - var lightAppearanceOptions = new[] { "Color", "Filter and Temperature" }; - colorTemperaturePopupValue = EditorGUILayout.Popup(Styles.lightAppearance, colorTemperaturePopupValue, lightAppearanceOptions); + colorTemperaturePopupValue = EditorGUILayout.Popup(LightUI.Styles.lightAppearance, colorTemperaturePopupValue, LightUI.Styles.lightAppearanceOptions); serializedLight.settings.useColorTemperature.boolValue = Convert.ToBoolean(colorTemperaturePopupValue); using (new EditorGUI.IndentLevelScope()) { if (serializedLight.settings.useColorTemperature.boolValue) { - EditorGUILayout.PropertyField(serializedLight.settings.color, Styles.colorFilter); - k_SliderWithTexture(Styles.colorTemperature, serializedLight.settings.colorTemperature, serializedLight.settings); + EditorGUILayout.PropertyField(serializedLight.settings.color, LightUI.Styles.colorFilter); + k_SliderWithTexture(LightUI.Styles.colorTemperature, serializedLight.settings.colorTemperature, serializedLight.settings); } else - EditorGUILayout.PropertyField(serializedLight.settings.color, Styles.color); + EditorGUILayout.PropertyField(serializedLight.settings.color, LightUI.Styles.color); } } else - EditorGUILayout.PropertyField(serializedLight.settings.color, Styles.color); + EditorGUILayout.PropertyField(serializedLight.settings.color, LightUI.Styles.color); } } diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs index 72aeacc0ad1..82bf5d0ae4a 100644 --- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs +++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs @@ -13,13 +13,13 @@ partial class UniversalRenderPipelineLightUI public static readonly CED.IDrawer PresetInspector = CED.Group( CED.Group((serialized, owner) => - EditorGUILayout.HelpBox(Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), + EditorGUILayout.HelpBox(LightUI.Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), CED.Group((serialized, owner) => EditorGUILayout.Space()), - CED.FoldoutGroup(Styles.generalHeader, + CED.FoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedStatePreset, DrawGeneralContentPreset), - CED.FoldoutGroup(Styles.emissionHeader, + CED.FoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedStatePreset, CED.Group(DrawerColor, diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs index 8414b405e51..d1605235505 100644 --- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs +++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs @@ -7,11 +7,6 @@ partial class UniversalRenderPipelineLightUI { static class Styles { - public static readonly GUIContent generalHeader = new GUIContent("General"); - public static readonly GUIContent shapeHeader = new GUIContent("Shape"); - public static readonly GUIContent renderingHeader = new GUIContent("Rendering"); - public static readonly GUIContent emissionHeader = new GUIContent("Emission"); - public static readonly GUIContent shadowHeader = new GUIContent("Shadows"); public static readonly GUIContent lightCookieHeader = new GUIContent("Light Cookie"); public static readonly GUIContent Type = EditorGUIUtility.TrTextContent("Type", "Specifies the current type of light. Possible types are Directional, Spot, Point, and Area lights."); @@ -46,7 +41,7 @@ static class Styles }; public static readonly GUIContent[] ShadowResolutionDefaultOptions = { - new GUIContent("Custom"), + EditorGUIUtility.TrTextContent("Custom"), UniversalRenderPipelineAssetUI.Styles.additionalLightsShadowResolutionTierNames[0], UniversalRenderPipelineAssetUI.Styles.additionalLightsShadowResolutionTierNames[1], UniversalRenderPipelineAssetUI.Styles.additionalLightsShadowResolutionTierNames[2], @@ -61,18 +56,11 @@ static class Styles EditorGUIUtility.TrTextContent("Use settings from Render Pipeline Asset") }; - public static readonly GUIContent LightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags."); public static readonly GUIContent customShadowLayers = EditorGUIUtility.TrTextContent("Custom Shadow Layers", "When enabled, you can use the Layer property below to specify the layers for shadows seperately to lighting. When disabled, the Light Layer property in the General section specifies the layers for both lighting and for shadows."); public static readonly GUIContent ShadowLayer = EditorGUIUtility.TrTextContent("Layer", "Specifies the light layer to use for shadows."); public static readonly GUIContent LightCookieSize = EditorGUIUtility.TrTextContent("Cookie Size", "Controls the size of the cookie mask currently assigned to the light."); public static readonly GUIContent LightCookieOffset = EditorGUIUtility.TrTextContent("Cookie Offset", "Controls the offset of the cookie mask currently assigned to the light."); - - public static readonly GUIContent colorTemperature = new GUIContent("Temperature", "Specifies a temperature (in Kelvin) used to correlate a color for the Light. For reference, White is 6500K."); - public static readonly GUIContent lightAppearance = new GUIContent("Light Appearance", "Specifies the mode for how this Light's color is calculated."); - public static readonly GUIContent color = new GUIContent("Color", "Specifies the color this Light emits."); - public static readonly GUIContent colorFilter = new GUIContent("Filter", "Specifies a color which tints the Light source."); - public static readonly string unsupportedPresetPropertiesMessage = L10n.Tr("When using Preset of Light Component, only a subset of properties are supported. Unsupported properties are hidden."); } } } From 55004d1dd5c789f1e355805e5d1ba600b16be1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Chodosevi=C4=8Dius?= Date: Mon, 6 Sep 2021 10:50:51 +0300 Subject: [PATCH 119/149] Shader Stripping Improvements (#5060) * Adding off keyword stripping. Adding builtin shader stripping. Adding volume based post processing stripping. * Fixing correct off keyword stripping only for urp shaders. Fixing punctual light stripping. Adding missing multi_compile_fragment. Disabling light cookies stripping for now. * Adding temp disabling * Disabling off striping of additional shadows * More disabled * Exposing striping options and updating striping logic with new features * Cleanup * Cleanup * Cleanup * Adding stripping to respect excluded build targets in quality settings * Cleanup * Temp setting change for QA pass * Format * Format * Renaming disabled keyword variants to off variants * Cleanup * Changing strip tool from class to struct * Cleanup * Fixing post processing stripping and fixing shadow cascade stripping * Cleanup * Fixing SSAO and VR stripping * Updating changelog * Cleanup * Edited the descriptions. * Fix null reference error * Renaming stripping options to have consistent naming and logic * Fixing strip debug variants option upgrader * Updating urp global settings for gfx split projects * Fixing obsolete warning for updater * Re-enabling to check if case still repros after shader striping changes 1330624 * Fixed standard shader upgraded to urp details to have same visual scale and offset. [1323725] * Cleanup and strip light layers on gles * Moving changes to new version in changelog * Reverting accidental changes that slipped form other branch * Cleanup Co-authored-by: Oleksandr Kokoshyn --- ...niversalRenderPipelineGlobalSettings.asset | 7 +- ...niversalRenderPipelineGlobalSettings.asset | 7 +- ...niversalRenderPipelineGlobalSettings.asset | 7 +- .../ProjectSettings/EditorBuildSettings.asset | 3 + ...salRenderPipelineGlobalSettings.asset.meta | 2 +- .../CHANGELOG.md | 6 +- .../Documentation~/urp-global-settings.md | 8 +- ...edUniversalRenderPipelineGlobalSettings.cs | 8 +- .../UniversalGlobalSettingsWindow.Skin.cs | 8 +- .../UniversalGlobalSettingsWindow.cs | 4 +- .../Editor/ShaderPreprocessor.cs | 680 +++++++++++++----- .../ScreenSpaceAmbientOcclusion.cs | 2 + .../UniversalRenderPipelineGlobalSettings.cs | 52 +- .../Shaders/Lit.shader | 12 +- .../Shaders/Nature/SpeedTree8.shader | 2 +- .../Shaders/SimpleLit.shader | 4 +- .../Shaders/Terrain/WavingGrass.shader | 2 +- .../Shaders/Utils/ScreenSpaceShadows.shader | 2 +- 18 files changed, 619 insertions(+), 197 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/UniversalRenderPipelineGlobalSettings.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/UniversalRenderPipelineGlobalSettings.asset index 322ffa10805..f84421db028 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 1 - k_AssetPreviousVersion: 1 + k_AssetVersion: 2 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -22,3 +21,7 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + supportRuntimeDebugDisplay: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/UniversalRenderPipelineGlobalSettings.asset b/TestProjects/UniversalGraphicsTest_Foundation/Assets/UniversalRenderPipelineGlobalSettings.asset index 322ffa10805..f84421db028 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 1 - k_AssetPreviousVersion: 1 + k_AssetVersion: 2 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -22,3 +21,7 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + supportRuntimeDebugDisplay: 0 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/UniversalRenderPipelineGlobalSettings.asset b/TestProjects/UniversalGraphicsTest_Lighting/Assets/UniversalRenderPipelineGlobalSettings.asset index 322ffa10805..f84421db028 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 1 - k_AssetPreviousVersion: 1 + k_AssetVersion: 2 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -22,3 +21,7 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 + m_StripDebugVariants: 1 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + supportRuntimeDebugDisplay: 0 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest_Lighting/ProjectSettings/EditorBuildSettings.asset index 924a8901593..5c4d21cffce 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest_Lighting/ProjectSettings/EditorBuildSettings.asset @@ -107,6 +107,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/152_Lighting_EnlightenEnvironment.unity guid: fb8f8e7cc18a5314f8d66d2ddfbfbaec + - enabled: 1 + path: Assets/Scenes/153_Lighting_EnlightenTerrain.unity + guid: 677cb6424a7fe3947974395b6c3d70a4 - enabled: 1 path: Assets/Scenes/200_DepthDeferred.unity guid: 3bbe19bef8dcc4e65b7aaa710c4114c6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset.meta index 8534f9f2b26..af1518c73fe 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/UniversalRenderPipelineGlobalSettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3ef2824440a4435ea9c71478ba6bc2c +guid: f5b86699a4e003a41936fffd835d4ba9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index c4427062974..efc9d342d08 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -5,9 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [13.0.0] - 2021-09-01 - -Version Updated -The version number for this package has increased due to a version update of a related graphics package. +### Added +- URP global setting for stripping post processing shader variants. +- URP global setting for stripping off shader variants. ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md b/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md index 6a59120b775..8eea9367a41 100644 --- a/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md +++ b/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md @@ -12,8 +12,12 @@ The section contains the following settings. Use this section to define the names of Light Layers. Light Layers only work with 3D Renderers. -## Miscellaneous +## Shader Stripping + +The check boxes in this section define which shader variants Unity strips when you build the Player. | **Property** | **Description** | | --------------------------| ------------------------------------------------------------ | -| Runtime Debug Shaders | When disabled, all debug display shader variants are removed when you build for the Unity Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds. | +| Strip Debug Variants | When enabled, Unity strips all debug view shader variants when you build the Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds. | +| Strip Unused Post Processing Variants | When enabled, Unity assumes that the Player does not create new [Volume Profiles](VolumeProfile.md) at runtime. With this assumption, Unity only keeps the shader variants that the existing [Volume Profiles](VolumeProfile.md) use, and strips all the other variants. Unity keeps shader variants used in Volume Profiles even if the Scenes in the project do not use the Profiles. | +| Strip Unused Variants | When enabled, Unity performs shader stripping in a more efficient way. This option reduces the amount of shader variants in the Player by a factor of 2 if the project uses the following URP features:
  • Light Layers
  • Native Render Pass
  • Reflection Probe Blending
  • Reflection Probe Box Projection
  • SSAO Renderer Feature
  • Decal Renderer Feature
  • Certain post-processing effects
Disable this option only if you see issues in the Player. | diff --git a/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs index 2006009e97b..c86b2c86f60 100644 --- a/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs @@ -19,7 +19,9 @@ class SerializedUniversalRenderPipelineGlobalSettings public SerializedProperty lightLayerName6; public SerializedProperty lightLayerName7; - public SerializedProperty supportRuntimeDebugDisplay; + public SerializedProperty stripDebugVariants; + public SerializedProperty stripUnusedPostProcessingVariants; + public SerializedProperty stripUnusedVariants; public SerializedUniversalRenderPipelineGlobalSettings(SerializedObject serializedObject) { @@ -44,7 +46,9 @@ public SerializedUniversalRenderPipelineGlobalSettings(SerializedObject serializ lightLayerName6 = serializedObject.Find((UniversalRenderPipelineGlobalSettings s) => s.lightLayerName6); lightLayerName7 = serializedObject.Find((UniversalRenderPipelineGlobalSettings s) => s.lightLayerName7); - supportRuntimeDebugDisplay = serializedObject.Find((UniversalRenderPipelineGlobalSettings s) => s.supportRuntimeDebugDisplay); + stripDebugVariants = serializedObject.FindProperty("m_StripDebugVariants"); + stripUnusedPostProcessingVariants = serializedObject.FindProperty("m_StripUnusedPostProcessingVariants"); + stripUnusedVariants = serializedObject.FindProperty("m_StripUnusedVariants"); } } } diff --git a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs index bedbd935d48..2407c8ed659 100644 --- a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs +++ b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs @@ -13,7 +13,7 @@ internal partial class UniversalGlobalSettingsPanelIMGUI { internal class Styles { - public const int labelWidth = 220; + public const int labelWidth = 260; public static readonly GUIContent lightLayersLabel = EditorGUIUtility.TrTextContent("Light Layer Names (3D)", "If the Light Layers feature is enabled in the URP Asset, Unity allocates memory for processing Light Layers. In the Deferred Rendering Path, this allocation includes an extra render target in GPU memory, which reduces performance."); public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer 0", "The display name for Light Layer 0."); @@ -25,8 +25,10 @@ internal class Styles public static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer 6", "The display name for Light Layer 6."); public static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer 7", "The display name for Light Layer 7."); - public static readonly GUIContent miscSettingsLabel = EditorGUIUtility.TrTextContent("Miscellaneous", "Miscellaneous settings"); - public static readonly GUIContent supportRuntimeDebugDisplayContentLabel = EditorGUIUtility.TrTextContent("Runtime Debug Shaders", "When disabled, all debug display shader variants are removed when you build for the Unity Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds."); + public static readonly GUIContent miscSettingsLabel = EditorGUIUtility.TrTextContent("Shader Stripping", "Shader Stripping settings"); + public static readonly GUIContent stripDebugVariantsLabel = EditorGUIUtility.TrTextContent("Strip Debug Variants", "When disabled, all debug display shader variants are removed when you build for the Unity Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds."); + public static readonly GUIContent stripUnusedPostProcessingVariantsLabel = EditorGUIUtility.TrTextContent("Strip Unused Post Processing Variants", "Controls whether strips automatically post processing shader variants based on VolumeProfile components. It strips based on VolumeProfiles in project and not scenes that actually uses it."); + public static readonly GUIContent stripUnusedVariantsLabel = EditorGUIUtility.TrTextContent("Strip Unused Variants", "Controls whether strip disabled keyword variants if the feature is enabled."); public static readonly string warningUrpNotActive = "Project graphics settings do not refer to a URP Asset. Check the settings: Graphics > Scriptable Render Pipeline Settings, Quality > Render Pipeline Asset."; public static readonly string warningGlobalSettingsMissing = "The Settings property does not contain a valid URP Global Settings asset. There might be issues in rendering. Select a valid URP Global Settings asset."; diff --git a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs index 04212129d30..3c4a641a592 100644 --- a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs +++ b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs @@ -232,7 +232,9 @@ static void DrawMiscSettings(SerializedUniversalRenderPipelineGlobalSettings ser using (new EditorGUI.IndentLevelScope()) { - EditorGUILayout.PropertyField(serialized.supportRuntimeDebugDisplay, Styles.supportRuntimeDebugDisplayContentLabel); + EditorGUILayout.PropertyField(serialized.stripDebugVariants, Styles.stripDebugVariantsLabel); + EditorGUILayout.PropertyField(serialized.stripUnusedPostProcessingVariants, Styles.stripUnusedPostProcessingVariantsLabel); + EditorGUILayout.PropertyField(serialized.stripUnusedVariants, Styles.stripUnusedVariantsLabel); } EditorGUIUtility.labelWidth = oldWidth; diff --git a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs index 6ac603b3c31..69b24ae7d31 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs @@ -7,6 +7,7 @@ using UnityEngine.Profiling; using UnityEngine.Rendering.Universal; using UnityEngine.Rendering; +using System.Runtime.CompilerServices; #if XR_MANAGEMENT_4_0_1_OR_NEWER using UnityEditor.XR.Management; @@ -27,24 +28,41 @@ enum ShaderFeatures MixedLighting = (1 << 6), TerrainHoles = (1 << 7), DeferredShading = (1 << 8), // DeferredRenderer is in the list of renderer - DeferredWithAccurateGbufferNormals = (1 << 9), - DeferredWithoutAccurateGbufferNormals = (1 << 10), - ScreenSpaceOcclusion = (1 << 11), - ScreenSpaceShadows = (1 << 12), - UseFastSRGBLinearConversion = (1 << 13), - LightLayers = (1 << 14), - ReflectionProbeBlending = (1 << 15), - ReflectionProbeBoxProjection = (1 << 16), - DBufferMRT1 = (1 << 17), - DBufferMRT2 = (1 << 18), - DBufferMRT3 = (1 << 19), - DecalScreenSpace = (1 << 20), - DecalGBuffer = (1 << 21), - DecalNormalBlendLow = (1 << 22), - DecalNormalBlendMedium = (1 << 23), - DecalNormalBlendHigh = (1 << 24), - ClusteredRendering = (1 << 25), - RenderPassEnabled = (1 << 26), + AccurateGbufferNormals = (1 << 9), + ScreenSpaceOcclusion = (1 << 10), + ScreenSpaceShadows = (1 << 11), + UseFastSRGBLinearConversion = (1 << 12), + LightLayers = (1 << 13), + ReflectionProbeBlending = (1 << 14), + ReflectionProbeBoxProjection = (1 << 15), + DBufferMRT1 = (1 << 16), + DBufferMRT2 = (1 << 17), + DBufferMRT3 = (1 << 18), + DecalScreenSpace = (1 << 19), + DecalGBuffer = (1 << 20), + DecalNormalBlendLow = (1 << 21), + DecalNormalBlendMedium = (1 << 22), + DecalNormalBlendHigh = (1 << 23), + ClusteredRendering = (1 << 24), + RenderPassEnabled = (1 << 25), + MainLightShadowsCascade = (1 << 26), + DrawProcedural = (1 << 27), + ScreenSpaceOcclusionAfterOpaque = (1 << 28), + } + + [Flags] + enum VolumeFeatures + { + None = 0, + Calculated = (1 << 0), + LensDistortion = (1 << 1), + Bloom = (1 << 2), + ChromaticAberration = (1 << 3), + ToneMaping = (1 << 4), + FilmGrain = (1 << 5), + DepthOfField = (1 << 6), + CameraMotionBlur = (1 << 7), + PaniniProjection = (1 << 8), } internal class ShaderPreprocessor : IPreprocessShaders @@ -59,44 +77,63 @@ internal class ShaderPreprocessor : IPreprocessShaders internal static event Action shaderPreprocessed; private static readonly System.Diagnostics.Stopwatch m_stripTimer = new System.Diagnostics.Stopwatch(); - ShaderKeyword m_MainLightShadows = new ShaderKeyword(ShaderKeywordStrings.MainLightShadows); - ShaderKeyword m_MainLightShadowsCascades = new ShaderKeyword(ShaderKeywordStrings.MainLightShadowCascades); - ShaderKeyword m_MainLightShadowsScreen = new ShaderKeyword(ShaderKeywordStrings.MainLightShadowScreen); - ShaderKeyword m_AdditionalLightsVertex = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightsVertex); - ShaderKeyword m_AdditionalLightsPixel = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightsPixel); - ShaderKeyword m_AdditionalLightShadows = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightShadows); - ShaderKeyword m_ReflectionProbeBlending = new ShaderKeyword(ShaderKeywordStrings.ReflectionProbeBlending); - ShaderKeyword m_ReflectionProbeBoxProjection = new ShaderKeyword(ShaderKeywordStrings.ReflectionProbeBoxProjection); - ShaderKeyword m_CastingPunctualLightShadow = new ShaderKeyword(ShaderKeywordStrings.CastingPunctualLightShadow); - ShaderKeyword m_SoftShadows = new ShaderKeyword(ShaderKeywordStrings.SoftShadows); - ShaderKeyword m_MixedLightingSubtractive = new ShaderKeyword(ShaderKeywordStrings.MixedLightingSubtractive); - ShaderKeyword m_LightmapShadowMixing = new ShaderKeyword(ShaderKeywordStrings.LightmapShadowMixing); - ShaderKeyword m_ShadowsShadowMask = new ShaderKeyword(ShaderKeywordStrings.ShadowsShadowMask); - ShaderKeyword m_Lightmap = new ShaderKeyword(ShaderKeywordStrings.LIGHTMAP_ON); - ShaderKeyword m_DynamicLightmap = new ShaderKeyword(ShaderKeywordStrings.DYNAMICLIGHTMAP_ON); - ShaderKeyword m_DirectionalLightmap = new ShaderKeyword(ShaderKeywordStrings.DIRLIGHTMAP_COMBINED); - ShaderKeyword m_AlphaTestOn = new ShaderKeyword(ShaderKeywordStrings._ALPHATEST_ON); - ShaderKeyword m_DeferredStencil = new ShaderKeyword(ShaderKeywordStrings._DEFERRED_STENCIL); - ShaderKeyword m_GbufferNormalsOct = new ShaderKeyword(ShaderKeywordStrings._GBUFFER_NORMALS_OCT); - ShaderKeyword m_UseDrawProcedural = new ShaderKeyword(ShaderKeywordStrings.UseDrawProcedural); - ShaderKeyword m_ScreenSpaceOcclusion = new ShaderKeyword(ShaderKeywordStrings.ScreenSpaceOcclusion); - ShaderKeyword m_UseFastSRGBLinearConversion = new ShaderKeyword(ShaderKeywordStrings.UseFastSRGBLinearConversion); - ShaderKeyword m_LightLayers = new ShaderKeyword(ShaderKeywordStrings.LightLayers); - ShaderKeyword m_RenderPassEnabled = new ShaderKeyword(ShaderKeywordStrings.RenderPassEnabled); - ShaderKeyword m_DebugDisplay = new ShaderKeyword(ShaderKeywordStrings.DEBUG_DISPLAY); - ShaderKeyword m_DBufferMRT1 = new ShaderKeyword(ShaderKeywordStrings.DBufferMRT1); - ShaderKeyword m_DBufferMRT2 = new ShaderKeyword(ShaderKeywordStrings.DBufferMRT2); - ShaderKeyword m_DBufferMRT3 = new ShaderKeyword(ShaderKeywordStrings.DBufferMRT3); - ShaderKeyword m_DecalNormalBlendLow = new ShaderKeyword(ShaderKeywordStrings.DecalNormalBlendLow); - ShaderKeyword m_DecalNormalBlendMedium = new ShaderKeyword(ShaderKeywordStrings.DecalNormalBlendMedium); - ShaderKeyword m_DecalNormalBlendHigh = new ShaderKeyword(ShaderKeywordStrings.DecalNormalBlendHigh); - ShaderKeyword m_ClusteredRendering = new ShaderKeyword(ShaderKeywordStrings.ClusteredRendering); - ShaderKeyword m_EditorVisualization = new ShaderKeyword(ShaderKeywordStrings.EDITOR_VISUALIZATION); - - ShaderKeyword m_LocalDetailMulx2; - ShaderKeyword m_LocalDetailScaled; - ShaderKeyword m_LocalClearCoat; - ShaderKeyword m_LocalClearCoatMap; + LocalKeyword m_MainLightShadows; + LocalKeyword m_MainLightShadowsCascades; + LocalKeyword m_MainLightShadowsScreen; + LocalKeyword m_AdditionalLightsVertex; + LocalKeyword m_AdditionalLightsPixel; + LocalKeyword m_AdditionalLightShadows; + LocalKeyword m_ReflectionProbeBlending; + LocalKeyword m_ReflectionProbeBoxProjection; + LocalKeyword m_CastingPunctualLightShadow; + LocalKeyword m_SoftShadows; + LocalKeyword m_MixedLightingSubtractive; + LocalKeyword m_LightmapShadowMixing; + LocalKeyword m_ShadowsShadowMask; + LocalKeyword m_Lightmap; + LocalKeyword m_DynamicLightmap; + LocalKeyword m_DirectionalLightmap; + LocalKeyword m_AlphaTestOn; + LocalKeyword m_DeferredStencil; + LocalKeyword m_GbufferNormalsOct; + LocalKeyword m_UseDrawProcedural; + LocalKeyword m_ScreenSpaceOcclusion; + LocalKeyword m_UseFastSRGBLinearConversion; + LocalKeyword m_LightLayers; + LocalKeyword m_RenderPassEnabled; + LocalKeyword m_DebugDisplay; + LocalKeyword m_DBufferMRT1; + LocalKeyword m_DBufferMRT2; + LocalKeyword m_DBufferMRT3; + LocalKeyword m_DecalNormalBlendLow; + LocalKeyword m_DecalNormalBlendMedium; + LocalKeyword m_DecalNormalBlendHigh; + LocalKeyword m_ClusteredRendering; + LocalKeyword m_EditorVisualization; + + LocalKeyword m_LocalDetailMulx2; + LocalKeyword m_LocalDetailScaled; + LocalKeyword m_LocalClearCoat; + LocalKeyword m_LocalClearCoatMap; + + LocalKeyword m_LensDistortion; + LocalKeyword m_ChromaticAberration; + LocalKeyword m_BloomLQ; + LocalKeyword m_BloomHQ; + LocalKeyword m_BloomLQDirt; + LocalKeyword m_BloomHQDirt; + LocalKeyword m_HdrGrading; + LocalKeyword m_ToneMapACES; + LocalKeyword m_ToneMapNeutral; + LocalKeyword m_FilmGrain; + + Shader m_BokehDepthOfField = Shader.Find("Hidden/Universal Render Pipeline/BokehDepthOfField"); + Shader m_GaussianDepthOfField = Shader.Find("Hidden/Universal Render Pipeline/GaussianDepthOfField"); + Shader m_CameraMotionBlur = Shader.Find("Hidden/Universal Render Pipeline/CameraMotionBlur"); + Shader m_PaniniProjection = Shader.Find("Hidden/Universal Render Pipeline/PaniniProjection"); + Shader m_Bloom = Shader.Find("Hidden/Universal Render Pipeline/Bloom"); + + Shader StencilDeferred = Shader.Find("Hidden/Universal Render Pipeline/StencilDeferred"); int m_TotalVariantsInputCount; int m_TotalVariantsOutputCount; @@ -105,12 +142,63 @@ internal class ShaderPreprocessor : IPreprocessShaders // The first one executed is the one where callbackOrder is returning the smallest number. public int callbackOrder { get { return 0; } } + LocalKeyword TryGetLocalKeyword(Shader shader, string name) + { + return shader.keywordSpace.FindKeyword(name); + } + void InitializeLocalShaderKeywords(Shader shader) { - m_LocalDetailMulx2 = new ShaderKeyword(shader, ShaderKeywordStrings._DETAIL_MULX2); - m_LocalDetailScaled = new ShaderKeyword(shader, ShaderKeywordStrings._DETAIL_SCALED); - m_LocalClearCoat = new ShaderKeyword(shader, ShaderKeywordStrings._CLEARCOAT); - m_LocalClearCoatMap = new ShaderKeyword(shader, ShaderKeywordStrings._CLEARCOATMAP); + m_MainLightShadows = TryGetLocalKeyword(shader, ShaderKeywordStrings.MainLightShadows); + m_MainLightShadowsCascades = TryGetLocalKeyword(shader, ShaderKeywordStrings.MainLightShadowCascades); + m_MainLightShadowsScreen = TryGetLocalKeyword(shader, ShaderKeywordStrings.MainLightShadowScreen); + m_AdditionalLightsVertex = TryGetLocalKeyword(shader, ShaderKeywordStrings.AdditionalLightsVertex); + m_AdditionalLightsPixel = TryGetLocalKeyword(shader, ShaderKeywordStrings.AdditionalLightsPixel); + m_AdditionalLightShadows = TryGetLocalKeyword(shader, ShaderKeywordStrings.AdditionalLightShadows); + m_ReflectionProbeBlending = TryGetLocalKeyword(shader, ShaderKeywordStrings.ReflectionProbeBlending); + m_ReflectionProbeBoxProjection = TryGetLocalKeyword(shader, ShaderKeywordStrings.ReflectionProbeBoxProjection); + m_CastingPunctualLightShadow = TryGetLocalKeyword(shader, ShaderKeywordStrings.CastingPunctualLightShadow); + m_SoftShadows = TryGetLocalKeyword(shader, ShaderKeywordStrings.SoftShadows); + m_MixedLightingSubtractive = TryGetLocalKeyword(shader, ShaderKeywordStrings.MixedLightingSubtractive); + m_LightmapShadowMixing = TryGetLocalKeyword(shader, ShaderKeywordStrings.LightmapShadowMixing); + m_ShadowsShadowMask = TryGetLocalKeyword(shader, ShaderKeywordStrings.ShadowsShadowMask); + m_Lightmap = TryGetLocalKeyword(shader, ShaderKeywordStrings.LIGHTMAP_ON); + m_DynamicLightmap = TryGetLocalKeyword(shader, ShaderKeywordStrings.DYNAMICLIGHTMAP_ON); + m_DirectionalLightmap = TryGetLocalKeyword(shader, ShaderKeywordStrings.DIRLIGHTMAP_COMBINED); + m_AlphaTestOn = TryGetLocalKeyword(shader, ShaderKeywordStrings._ALPHATEST_ON); + m_DeferredStencil = TryGetLocalKeyword(shader, ShaderKeywordStrings._DEFERRED_STENCIL); + m_GbufferNormalsOct = TryGetLocalKeyword(shader, ShaderKeywordStrings._GBUFFER_NORMALS_OCT); + m_UseDrawProcedural = TryGetLocalKeyword(shader, ShaderKeywordStrings.UseDrawProcedural); + m_ScreenSpaceOcclusion = TryGetLocalKeyword(shader, ShaderKeywordStrings.ScreenSpaceOcclusion); + m_UseFastSRGBLinearConversion = TryGetLocalKeyword(shader, ShaderKeywordStrings.UseFastSRGBLinearConversion); + m_LightLayers = TryGetLocalKeyword(shader, ShaderKeywordStrings.LightLayers); + m_RenderPassEnabled = TryGetLocalKeyword(shader, ShaderKeywordStrings.RenderPassEnabled); + m_DebugDisplay = TryGetLocalKeyword(shader, ShaderKeywordStrings.DEBUG_DISPLAY); + m_DBufferMRT1 = TryGetLocalKeyword(shader, ShaderKeywordStrings.DBufferMRT1); + m_DBufferMRT2 = TryGetLocalKeyword(shader, ShaderKeywordStrings.DBufferMRT2); + m_DBufferMRT3 = TryGetLocalKeyword(shader, ShaderKeywordStrings.DBufferMRT3); + m_DecalNormalBlendLow = TryGetLocalKeyword(shader, ShaderKeywordStrings.DecalNormalBlendLow); + m_DecalNormalBlendMedium = TryGetLocalKeyword(shader, ShaderKeywordStrings.DecalNormalBlendMedium); + m_DecalNormalBlendHigh = TryGetLocalKeyword(shader, ShaderKeywordStrings.DecalNormalBlendHigh); + m_ClusteredRendering = TryGetLocalKeyword(shader, ShaderKeywordStrings.ClusteredRendering); + m_EditorVisualization = TryGetLocalKeyword(shader, ShaderKeywordStrings.EDITOR_VISUALIZATION); + + m_LocalDetailMulx2 = TryGetLocalKeyword(shader, ShaderKeywordStrings._DETAIL_MULX2); + m_LocalDetailScaled = TryGetLocalKeyword(shader, ShaderKeywordStrings._DETAIL_SCALED); + m_LocalClearCoat = TryGetLocalKeyword(shader, ShaderKeywordStrings._CLEARCOAT); + m_LocalClearCoatMap = TryGetLocalKeyword(shader, ShaderKeywordStrings._CLEARCOATMAP); + + // Post processing + m_LensDistortion = TryGetLocalKeyword(shader, ShaderKeywordStrings.Distortion); + m_ChromaticAberration = TryGetLocalKeyword(shader, ShaderKeywordStrings.ChromaticAberration); + m_BloomLQ = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomLQ); + m_BloomHQ = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomHQ); + m_BloomLQDirt = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomLQDirt); + m_BloomHQDirt = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomHQDirt); + m_HdrGrading = TryGetLocalKeyword(shader, ShaderKeywordStrings.HDRGrading); + m_ToneMapACES = TryGetLocalKeyword(shader, ShaderKeywordStrings.TonemapACES); + m_ToneMapNeutral = TryGetLocalKeyword(shader, ShaderKeywordStrings.TonemapNeutral); + m_FilmGrain = TryGetLocalKeyword(shader, ShaderKeywordStrings.FilmGrain); } bool IsFeatureEnabled(ShaderFeatures featureMask, ShaderFeatures feature) @@ -118,6 +206,11 @@ bool IsFeatureEnabled(ShaderFeatures featureMask, ShaderFeatures feature) return (featureMask & feature) != 0; } + bool IsFeatureEnabled(VolumeFeatures featureMask, VolumeFeatures feature) + { + return (featureMask & feature) != 0; + } + bool StripUnusedPass(ShaderFeatures features, ShaderSnippetData snippetData) { // Meta pass is needed in the player for Enlighten Precomputed Realtime GI albedo and emission. @@ -151,10 +244,102 @@ bool StripUnusedPass(ShaderFeatures features, ShaderSnippetData snippetData) return false; } + struct StripTool where T : System.Enum + { + T m_Features; + Shader m_Shader; + ShaderKeywordSet m_KeywordSet; + ShaderSnippetData m_SnippetData; + bool m_stripUnusedVariants; + + public StripTool(T features, Shader shader, ShaderSnippetData snippetData, in ShaderKeywordSet keywordSet, bool stripUnusedVariants) + { + m_Features = features; + m_Shader = shader; + m_SnippetData = snippetData; + m_KeywordSet = keywordSet; + m_stripUnusedVariants = stripUnusedVariants; + } + + bool ContainsKeyword(in LocalKeyword kw) + { + return ShaderUtil.PassHasKeyword(m_Shader, m_SnippetData.pass, kw, m_SnippetData.shaderType); + } + + public bool StripMultiCompileKeepOffVariant(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2, in LocalKeyword kw3, T feature3) + { + if (StripMultiCompileKeepOffVariant(kw, feature)) + return true; + if (StripMultiCompileKeepOffVariant(kw2, feature2)) + return true; + if (StripMultiCompileKeepOffVariant(kw3, feature3)) + return true; + return false; + } + + public bool StripMultiCompile(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2, in LocalKeyword kw3, T feature3) + { + if (StripMultiCompileKeepOffVariant(kw, feature, kw2, feature2, kw3, feature3)) + return true; + + bool containsKeywords = ContainsKeyword(kw) && ContainsKeyword(kw2) && ContainsKeyword(kw3); + bool keywordsDisabled = !m_KeywordSet.IsEnabled(kw) && !m_KeywordSet.IsEnabled(kw2) && !m_KeywordSet.IsEnabled(kw3); + bool hasAnyFeatureEnabled = m_Features.HasFlag(feature) || m_Features.HasFlag(feature2) || m_Features.HasFlag(feature3); + if (m_stripUnusedVariants && containsKeywords && keywordsDisabled && hasAnyFeatureEnabled) + return true; + + return false; + } + + public bool StripMultiCompileKeepOffVariant(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2) + { + if (StripMultiCompileKeepOffVariant(kw, feature)) + return true; + if (StripMultiCompileKeepOffVariant(kw2, feature2)) + return true; + return false; + } + + public bool StripMultiCompile(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2) + { + if (StripMultiCompileKeepOffVariant(kw, feature, kw2, feature2)) + return true; + + bool containsKeywords = ContainsKeyword(kw) && ContainsKeyword(kw2); + bool keywordsDisabled = !m_KeywordSet.IsEnabled(kw) && !m_KeywordSet.IsEnabled(kw2); + bool hasAnyFeatureEnabled = m_Features.HasFlag(feature) || m_Features.HasFlag(feature2); + if (m_stripUnusedVariants && containsKeywords && keywordsDisabled && hasAnyFeatureEnabled) + return true; + + return false; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public bool StripMultiCompileKeepOffVariant(in LocalKeyword kw, T feature) + { + return !m_Features.HasFlag(feature) && m_KeywordSet.IsEnabled(kw); + } + + public bool StripMultiCompile(in LocalKeyword kw, T feature) + { + if (!m_Features.HasFlag(feature)) + { + if (m_KeywordSet.IsEnabled(kw)) + return true; + } + else if (m_stripUnusedVariants) + { + if (!m_KeywordSet.IsEnabled(kw) && ContainsKeyword(kw)) + return true; + } + return false; + } + } + bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetData snippetData, ShaderCompilerData compilerData) { var globalSettings = UniversalRenderPipelineGlobalSettings.instance; - bool stripDebugDisplayShaders = !Debug.isDebugBuild || (globalSettings == null || !globalSettings.supportRuntimeDebugDisplay); + bool stripDebugDisplayShaders = !Debug.isDebugBuild || (globalSettings == null || globalSettings.stripDebugVariants); #if XR_MANAGEMENT_4_0_1_OR_NEWER var buildTargetSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(BuildTargetGroup.Standalone); @@ -169,24 +354,19 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa return true; } - // strip main light shadows, cascade and screen variants - if (!IsFeatureEnabled(features, ShaderFeatures.MainLightShadows)) - { - if (compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadows)) - return true; - - if (compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadowsCascades)) - return true; + var stripUnusedVariants = UniversalRenderPipelineGlobalSettings.instance?.stripUnusedVariants == true; + var stripTool = new StripTool(features, shader, snippetData, compilerData.shaderKeywordSet, stripUnusedVariants); - if (compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadowsScreen)) - return true; - - if (snippetData.passType == PassType.ShadowCaster && !compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow)) - return true; - } + // strip main light shadows, cascade and screen variants + // TODO: Strip disabled keyword once no light will re-use same variant + if (stripTool.StripMultiCompileKeepOffVariant( + m_MainLightShadows, ShaderFeatures.MainLightShadows, + m_MainLightShadowsCascades, ShaderFeatures.MainLightShadowsCascade, + m_MainLightShadowsScreen, ShaderFeatures.ScreenSpaceShadows)) + return true; - bool isSoftShadow = compilerData.shaderKeywordSet.IsEnabled(m_SoftShadows); - if (!IsFeatureEnabled(features, ShaderFeatures.SoftShadows) && isSoftShadow) + // TODO: Strip off variants once we have global soft shadows option for forcing instead as support + if (stripTool.StripMultiCompileKeepOffVariant(m_SoftShadows, ShaderFeatures.SoftShadows)) return true; // Left for backward compatibility @@ -194,8 +374,7 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa !IsFeatureEnabled(features, ShaderFeatures.MixedLighting)) return true; - if (compilerData.shaderKeywordSet.IsEnabled(m_UseFastSRGBLinearConversion) && - !IsFeatureEnabled(features, ShaderFeatures.UseFastSRGBLinearConversion)) + if (stripTool.StripMultiCompile(m_UseFastSRGBLinearConversion, ShaderFeatures.UseFastSRGBLinearConversion)) return true; // Strip here only if mixed lighting is disabled @@ -205,81 +384,140 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa !IsFeatureEnabled(features, ShaderFeatures.MixedLighting)) return true; - if (compilerData.shaderKeywordSet.IsEnabled(m_LightLayers) && - !IsFeatureEnabled(features, ShaderFeatures.LightLayers)) - return true; + if (compilerData.shaderCompilerPlatform == ShaderCompilerPlatform.GLES20) + { + // GLES2 does not support bitwise operations. + if (compilerData.shaderKeywordSet.IsEnabled(m_LightLayers)) + return true; + } + else + { + if (stripTool.StripMultiCompile(m_LightLayers, ShaderFeatures.LightLayers)) + return true; + } - if (compilerData.shaderKeywordSet.IsEnabled(m_RenderPassEnabled) && - !IsFeatureEnabled(features, ShaderFeatures.RenderPassEnabled)) + if (stripTool.StripMultiCompile(m_RenderPassEnabled, ShaderFeatures.RenderPassEnabled)) return true; // No additional light shadows - bool isAdditionalLightShadow = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightShadows); - if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && isAdditionalLightShadow) + // TODO: Strip off variants once we support no shadow lights re-use same variant + if (stripTool.StripMultiCompileKeepOffVariant(m_AdditionalLightShadows, ShaderFeatures.AdditionalLightShadows)) return true; - bool isReflectionProbeBlending = compilerData.shaderKeywordSet.IsEnabled(m_ReflectionProbeBlending); - if (!IsFeatureEnabled(features, ShaderFeatures.ReflectionProbeBlending) && isReflectionProbeBlending) + if (stripTool.StripMultiCompile(m_ReflectionProbeBlending, ShaderFeatures.ReflectionProbeBlending)) return true; - bool isReflectionProbeBoxProjection = compilerData.shaderKeywordSet.IsEnabled(m_ReflectionProbeBoxProjection); - if (!IsFeatureEnabled(features, ShaderFeatures.ReflectionProbeBoxProjection) && isReflectionProbeBoxProjection) + if (stripTool.StripMultiCompile(m_ReflectionProbeBoxProjection, ShaderFeatures.ReflectionProbeBoxProjection)) return true; - bool isPunctualLightShadowCasterPass = (snippetData.passType == PassType.ShadowCaster) && compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow); - if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && isPunctualLightShadowCasterPass) - return true; + // Shadow caster punctual light strip + if (snippetData.passType == PassType.ShadowCaster && ShaderUtil.PassHasKeyword(shader, snippetData.pass, m_CastingPunctualLightShadow, snippetData.shaderType)) + { + if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow)) + return true; + + bool mainLightShadows = + !IsFeatureEnabled(features, ShaderFeatures.MainLightShadows) && + !IsFeatureEnabled(features, ShaderFeatures.MainLightShadowsCascade) && + !IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceShadows); + if (mainLightShadows && !compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow)) + return true; + } // Additional light are shaded per-vertex or per-pixel. - bool isFeaturePerPixelLightingEnabled = IsFeatureEnabled(features, ShaderFeatures.AdditionalLights); - bool isFeaturePerVertexLightingEnabled = IsFeatureEnabled(features, ShaderFeatures.VertexLighting); - bool clusteredRendering = IsFeatureEnabled(features, ShaderFeatures.ClusteredRendering); - bool isAdditionalLightPerPixel = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightsPixel); - bool isAdditionalLightPerVertex = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightsVertex); + // TODO: Strip off variants once we support no additional lights re-used variants + if (stripTool.StripMultiCompileKeepOffVariant(m_AdditionalLightsVertex, ShaderFeatures.VertexLighting, + m_AdditionalLightsPixel, ShaderFeatures.AdditionalLights)) + return true; + + if (stripTool.StripMultiCompile(m_ClusteredRendering, ShaderFeatures.ClusteredRendering)) + return true; + + // Screen Space Occlusion + if (IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceOcclusionAfterOpaque)) + { + // SSAO after opaque setting requires off variants + if (stripTool.StripMultiCompileKeepOffVariant(m_ScreenSpaceOcclusion, ShaderFeatures.ScreenSpaceOcclusion)) + return true; + } + else + { + if (stripTool.StripMultiCompile(m_ScreenSpaceOcclusion, ShaderFeatures.ScreenSpaceOcclusion)) + return true; + } + + // Decal DBuffer + if (stripTool.StripMultiCompile( + m_DBufferMRT1, ShaderFeatures.DBufferMRT1, + m_DBufferMRT2, ShaderFeatures.DBufferMRT2, + m_DBufferMRT3, ShaderFeatures.DBufferMRT3)) + return true; + + // TODO: Test against lightMode tag instead. + if (snippetData.passName == kPassNameGBuffer) + { + if (!IsFeatureEnabled(features, ShaderFeatures.DeferredShading)) + return true; + } - // Strip if Per-Pixel lighting is NOT used in the project and the - // Per-Pixel (_ADDITIONAL_LIGHTS) variant is enabled in the shader. - if (!isFeaturePerPixelLightingEnabled && isAdditionalLightPerPixel) + // Do not strip accurateGbufferNormals on Mobile Vulkan as some GPUs do not support R8G8B8A8_SNorm, which then force us to use accurateGbufferNormals + if (compilerData.shaderCompilerPlatform != ShaderCompilerPlatform.Vulkan && + stripTool.StripMultiCompile(m_GbufferNormalsOct, ShaderFeatures.AccurateGbufferNormals)) return true; - // Strip if Per-Vertex lighting is NOT used in the project and the - // Per-Vertex (_ADDITIONAL_LIGHTS_VERTEX) variant is enabled in the shader. - if (!isFeaturePerVertexLightingEnabled && isAdditionalLightPerVertex) + if (compilerData.shaderKeywordSet.IsEnabled(m_UseDrawProcedural) && + !IsFeatureEnabled(features, ShaderFeatures.DrawProcedural)) return true; - if (!clusteredRendering && compilerData.shaderKeywordSet.IsEnabled(m_ClusteredRendering)) + // Decal Normal Blend + if (stripTool.StripMultiCompile( + m_DecalNormalBlendLow, ShaderFeatures.DecalNormalBlendLow, + m_DecalNormalBlendMedium, ShaderFeatures.DecalNormalBlendMedium, + m_DecalNormalBlendHigh, ShaderFeatures.DecalNormalBlendHigh)) return true; - // Screen Space Shadows - if (!IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceShadows) && - compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadowsScreen)) + return false; + } + + bool StripVolumeFeatures(VolumeFeatures features, Shader shader, ShaderSnippetData snippetData, ShaderCompilerData compilerData) + { + var stripUnusedVariants = UniversalRenderPipelineGlobalSettings.instance?.stripUnusedVariants == true; + var stripTool = new StripTool(features, shader, snippetData, compilerData.shaderKeywordSet, stripUnusedVariants); + + if (stripTool.StripMultiCompileKeepOffVariant(m_LensDistortion, VolumeFeatures.LensDistortion)) return true; - // Screen Space Occlusion - if (!IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceOcclusion) && - compilerData.shaderKeywordSet.IsEnabled(m_ScreenSpaceOcclusion)) + if (stripTool.StripMultiCompileKeepOffVariant(m_ChromaticAberration, VolumeFeatures.ChromaticAberration)) return true; - // Decal DBuffer - if (!IsFeatureEnabled(features, ShaderFeatures.DBufferMRT1) && - compilerData.shaderKeywordSet.IsEnabled(m_DBufferMRT1)) + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomLQ, VolumeFeatures.Bloom)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomHQ, VolumeFeatures.Bloom)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DBufferMRT2) && - compilerData.shaderKeywordSet.IsEnabled(m_DBufferMRT2)) + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomLQDirt, VolumeFeatures.Bloom)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DBufferMRT3) && - compilerData.shaderKeywordSet.IsEnabled(m_DBufferMRT3)) + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomHQDirt, VolumeFeatures.Bloom)) return true; - // Decal Normal Blend - if (!IsFeatureEnabled(features, ShaderFeatures.DecalNormalBlendLow) && - compilerData.shaderKeywordSet.IsEnabled(m_DecalNormalBlendLow)) + if (stripTool.StripMultiCompileKeepOffVariant(m_HdrGrading, VolumeFeatures.ToneMaping)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_ToneMapACES, VolumeFeatures.ToneMaping)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_ToneMapNeutral, VolumeFeatures.ToneMaping)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_FilmGrain, VolumeFeatures.FilmGrain)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DecalNormalBlendMedium) && - compilerData.shaderKeywordSet.IsEnabled(m_DecalNormalBlendMedium)) + + // Strip post processing shaders + if (shader == m_BokehDepthOfField && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.DepthOfField)) + return true; + if (shader == m_GaussianDepthOfField && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.DepthOfField)) + return true; + if (shader == m_CameraMotionBlur && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.CameraMotionBlur)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DecalNormalBlendHigh) && - compilerData.shaderKeywordSet.IsEnabled(m_DecalNormalBlendHigh)) + if (shader == m_PaniniProjection && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.PaniniProjection)) + return true; + if (shader == m_Bloom && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.Bloom)) return true; return false; @@ -342,6 +580,17 @@ bool StripInvalidVariants(ShaderCompilerData compilerData) return false; } + bool StripUnusedShaders(ShaderFeatures features, Shader shader) + { + if (!IsFeatureEnabled(features, ShaderFeatures.DeferredShading)) + { + if (shader == StencilDeferred) + return true; + } + + return false; + } + bool StripUnused(ShaderFeatures features, Shader shader, ShaderSnippetData snippetData, ShaderCompilerData compilerData) { if (StripUnusedFeatures(features, shader, snippetData, compilerData)) @@ -356,6 +605,12 @@ bool StripUnused(ShaderFeatures features, Shader shader, ShaderSnippetData snipp if (StripUnusedPass(features, snippetData)) return true; + if (UniversalRenderPipelineGlobalSettings.instance?.stripUnusedVariants == true) + { + if (StripUnusedShaders(features, shader)) + return true; + } + // Strip terrain holes // TODO: checking for the string name here is expensive // maybe we can rename alpha clip keyword name to be specific to terrain? @@ -364,22 +619,10 @@ bool StripUnused(ShaderFeatures features, Shader shader, ShaderSnippetData snipp shader.name.Contains(kTerrainShaderName)) return true; - // TODO: Test against lightMode tag instead. - if (snippetData.passName == kPassNameGBuffer) - { - if (!IsFeatureEnabled(features, ShaderFeatures.DeferredShading)) - return true; - - // Do not strip accurateGbufferNormals on Mobile Vulkan as some GPUs do not support R8G8B8A8_SNorm, which then force us to use accurateGbufferNormals - if (!IsFeatureEnabled(features, ShaderFeatures.DeferredWithAccurateGbufferNormals) && compilerData.shaderKeywordSet.IsEnabled(m_GbufferNormalsOct) && compilerData.shaderCompilerPlatform != ShaderCompilerPlatform.Vulkan) - return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DeferredWithoutAccurateGbufferNormals) && !compilerData.shaderKeywordSet.IsEnabled(m_GbufferNormalsOct)) - return true; - } return false; } - void LogShaderVariants(Shader shader, ShaderSnippetData snippetData, ShaderVariantLogLevel logLevel, int prevVariantsCount, int currVariantsCount) + void LogShaderVariants(Shader shader, ShaderSnippetData snippetData, ShaderVariantLogLevel logLevel, int prevVariantsCount, int currVariantsCount, double stripTimeMs) { if (logLevel == ShaderVariantLogLevel.AllShaders || shader.name.Contains("Universal Render Pipeline")) { @@ -387,10 +630,10 @@ void LogShaderVariants(Shader shader, ShaderSnippetData snippetData, ShaderVaria float percentageTotal = (float)m_TotalVariantsOutputCount / (float)m_TotalVariantsInputCount * 100f; string result = string.Format("STRIPPING: {0} ({1} pass) ({2}) -" + - " Remaining shader variants = {3}/{4} = {5}% - Total = {6}/{7} = {8}%", + " Remaining shader variants = {3}/{4} = {5}% - Total = {6}/{7} = {8}% TimeMs={9}", shader.name, snippetData.passName, snippetData.shaderType.ToString(), currVariantsCount, prevVariantsCount, percentageCurrent, m_TotalVariantsOutputCount, m_TotalVariantsInputCount, - percentageTotal); + percentageTotal, stripTimeMs); Debug.Log(result); } } @@ -405,16 +648,16 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< if (urpAsset == null || compilerDataList == null || compilerDataList.Count == 0) return; - // Local Keywords need to be initialized with the shader - InitializeLocalShaderKeywords(shader); - m_stripTimer.Start(); + InitializeLocalShaderKeywords(shader); + int prevVariantCount = compilerDataList.Count; var inputShaderVariantCount = compilerDataList.Count; for (int i = 0; i < inputShaderVariantCount;) { bool removeInput = true; + foreach (var supportedFeatures in ShaderBuildPreprocessor.supportedFeaturesList) { if (!StripUnused(supportedFeatures, shader, snippetData, compilerDataList[i])) @@ -424,6 +667,14 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< } } + if (UniversalRenderPipelineGlobalSettings.instance?.stripUnusedPostProcessingVariants == true) + { + if (!removeInput && StripVolumeFeatures(ShaderBuildPreprocessor.volumeFeatures, shader, snippetData, compilerDataList[i])) + { + removeInput = true; + } + } + // Remove at swap back if (removeInput) compilerDataList[i] = compilerDataList[--inputShaderVariantCount]; @@ -439,15 +690,16 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< compilerDataList.RemoveAt(i); } + m_stripTimer.Stop(); + double stripTimeMs = m_stripTimer.Elapsed.TotalMilliseconds; + m_stripTimer.Reset(); + if (urpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { m_TotalVariantsInputCount += prevVariantCount; m_TotalVariantsOutputCount += compilerDataList.Count; - LogShaderVariants(shader, snippetData, urpAsset.shaderVariantLogLevel, prevVariantCount, compilerDataList.Count); + LogShaderVariants(shader, snippetData, urpAsset.shaderVariantLogLevel, prevVariantCount, compilerDataList.Count, stripTimeMs); } - m_stripTimer.Stop(); - double stripTimeMs = m_stripTimer.Elapsed.TotalMilliseconds; - m_stripTimer.Reset(); #if PROFILE_BUILD Profiler.EndSample(); @@ -472,6 +724,16 @@ public static List supportedFeaturesList private static List s_SupportedFeaturesList = new List(); + public static VolumeFeatures volumeFeatures + { + get + { + if (s_VolumeFeatures == VolumeFeatures.None) + FetchAllSupportedFeaturesFromVolumes(); + return s_VolumeFeatures; + } + } + private static VolumeFeatures s_VolumeFeatures; public int callbackOrder { get { return 0; } } #if PROFILE_BUILD @@ -485,6 +747,7 @@ public void OnPostprocessBuild(BuildReport report) public void OnPreprocessBuild(BuildReport report) { FetchAllSupportedFeatures(); + FetchAllSupportedFeaturesFromVolumes(); #if PROFILE_BUILD Profiler.enableBinaryLog = true; Profiler.logFile = "profilerlog.raw"; @@ -492,13 +755,59 @@ public void OnPreprocessBuild(BuildReport report) #endif } + static bool TryGetRenderPipelineAssetsForBuildTarget(BuildTarget buildTarget, List urps) + { + var qualitySettings = new SerializedObject(QualitySettings.GetQualitySettings()); + if (qualitySettings == null) + return false; + + var property = qualitySettings.FindProperty("m_QualitySettings"); + if (property == null) + return false; + + var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); + var activeBuildTargetGroupName = activeBuildTargetGroup.ToString(); + + for (int i = 0; i < property.arraySize; i++) + { + bool isExcluded = false; + + var excludedTargetPlatforms = property.GetArrayElementAtIndex(i).FindPropertyRelative("excludedTargetPlatforms"); + if (excludedTargetPlatforms == null) + return false; + + foreach (SerializedProperty excludedTargetPlatform in excludedTargetPlatforms) + { + var excludedBuildTargetGroupName = excludedTargetPlatform.stringValue; + if (activeBuildTargetGroupName == excludedBuildTargetGroupName) + { + Debug.Log($"Excluding quality level {QualitySettings.names[i]} from stripping."); // TODO: remove after QA + isExcluded = true; + break; + } + } + + if (!isExcluded) + urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + } + + return true; + } + private static void FetchAllSupportedFeatures() { List urps = new List(); urps.Add(GraphicsSettings.defaultRenderPipeline as UniversalRenderPipelineAsset); - for (int i = 0; i < QualitySettings.names.Length; i++) + + // TODO: Replace once we have official API for filtering urps per build target + if (!TryGetRenderPipelineAssetsForBuildTarget(EditorUserBuildSettings.activeBuildTarget, urps)) { - urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + // Fallback + Debug.LogWarning("Shader stripping per enabled quality levels failed! Stripping will use all quality levels. Please report a bug!"); + for (int i = 0; i < QualitySettings.names.Length; i++) + { + urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + } } s_SupportedFeaturesList.Clear(); @@ -507,18 +816,63 @@ private static void FetchAllSupportedFeatures() { if (urp != null) { - s_SupportedFeaturesList.Add(GetSupportedShaderFeatures(urp)); + int rendererCount = urp.m_RendererDataList.Length; + + for (int i = 0; i < rendererCount; ++i) + s_SupportedFeaturesList.Add(GetSupportedShaderFeatures(urp, i)); } } } - private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipelineAsset pipelineAsset) + private static void FetchAllSupportedFeaturesFromVolumes() + { + if (UniversalRenderPipelineGlobalSettings.instance?.stripUnusedPostProcessingVariants == false) + return; + + s_VolumeFeatures = VolumeFeatures.Calculated; + var guids = AssetDatabase.FindAssets("t:VolumeProfile"); + foreach (var guid in guids) + { + var path = AssetDatabase.GUIDToAssetPath(guid); + + // We only care what is in assets folder + if (!path.StartsWith("Assets")) + continue; + + var asset = AssetDatabase.LoadAssetAtPath(path); + if (asset == null) + continue; + + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.LensDistortion; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.Bloom; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.ToneMaping; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.FilmGrain; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.DepthOfField; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.CameraMotionBlur; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.PaniniProjection; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.ChromaticAberration; + } + } + + private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipelineAsset pipelineAsset, int rendererIndex) { ShaderFeatures shaderFeatures; shaderFeatures = ShaderFeatures.MainLight; if (pipelineAsset.supportsMainLightShadows) + { + // User can change cascade count at runtime, so we have to include both of them for now shaderFeatures |= ShaderFeatures.MainLightShadows; + shaderFeatures |= ShaderFeatures.MainLightShadowsCascade; + } if (pipelineAsset.additionalLightsRenderingMode == LightRenderingMode.PerVertex) { @@ -549,14 +903,11 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline bool hasScreenSpaceShadows = false; bool hasScreenSpaceOcclusion = false; bool hasDeferredRenderer = false; - bool withAccurateGbufferNormals = false; - bool withoutAccurateGbufferNormals = false; + bool accurateGbufferNormals = false; bool clusteredRendering = false; bool onlyClusteredRendering = false; bool usesRenderPass = false; - int rendererCount = pipelineAsset.m_RendererDataList.Length; - for (int rendererIndex = 0; rendererIndex < rendererCount; ++rendererIndex) { ScriptableRenderer renderer = pipelineAsset.GetRenderer(rendererIndex); if (renderer is UniversalRenderer) @@ -565,8 +916,7 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline if (universalRenderer.renderingMode == RenderingMode.Deferred) { hasDeferredRenderer |= true; - withAccurateGbufferNormals |= universalRenderer.accurateGbufferNormals; - withoutAccurateGbufferNormals |= !universalRenderer.accurateGbufferNormals; + accurateGbufferNormals |= universalRenderer.accurateGbufferNormals; usesRenderPass |= universalRenderer.useRenderPassEnabled; } } @@ -587,6 +937,9 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline ScreenSpaceAmbientOcclusion ssao = rendererFeature as ScreenSpaceAmbientOcclusion; hasScreenSpaceOcclusion |= ssao != null; + if (ssao?.afterOpaque ?? false) + shaderFeatures |= ShaderFeatures.ScreenSpaceOcclusionAfterOpaque; + // Check for Decal Renderer Feature DecalRendererFeature decal = rendererFeature as DecalRendererFeature; if (decal != null) @@ -613,6 +966,11 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline { rendererClustered = universalRendererData.renderingMode == RenderingMode.Forward && universalRendererData.clusteredRendering; + +#if ENABLE_VR && ENABLE_XR_MODULE + if (universalRendererData.xrSystemData != null) + shaderFeatures |= ShaderFeatures.DrawProcedural; +#endif } } @@ -623,12 +981,8 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline if (hasDeferredRenderer) shaderFeatures |= ShaderFeatures.DeferredShading; - // We can only strip accurateGbufferNormals related variants if all DeferredRenderers use the same option. - if (withAccurateGbufferNormals) - shaderFeatures |= ShaderFeatures.DeferredWithAccurateGbufferNormals; - - if (withoutAccurateGbufferNormals) - shaderFeatures |= ShaderFeatures.DeferredWithoutAccurateGbufferNormals; + if (accurateGbufferNormals) + shaderFeatures |= ShaderFeatures.AccurateGbufferNormals; if (hasScreenSpaceShadows) shaderFeatures |= ShaderFeatures.ScreenSpaceShadows; diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs index b58b03a48a6..36fc33503c1 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs @@ -51,6 +51,8 @@ internal class ScreenSpaceAmbientOcclusion : ScriptableRendererFeature private const string k_SourceDepthKeyword = "_SOURCE_DEPTH"; private const string k_SourceDepthNormalsKeyword = "_SOURCE_DEPTH_NORMALS"; + internal bool afterOpaque => m_Settings.AfterOpaque; + /// public override void Create() { diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs index 24453d03357..35f4d9bba13 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs @@ -1,4 +1,6 @@ +using System; using UnityEditor; +using UnityEngine.Serialization; namespace UnityEngine.Rendering.Universal { @@ -8,19 +10,22 @@ namespace UnityEngine.Rendering.Universal /// - light layer names /// [URPHelpURL("URP-Global-Settings")] - partial class UniversalRenderPipelineGlobalSettings : RenderPipelineGlobalSettings + partial class UniversalRenderPipelineGlobalSettings : RenderPipelineGlobalSettings, ISerializationCallbackReceiver { #region Version system #pragma warning disable CS0414 - [SerializeField] int k_AssetVersion = 1; - [SerializeField] int k_AssetPreviousVersion = 1; + [SerializeField] int k_AssetVersion = 2; #pragma warning restore CS0414 + public void OnBeforeSerialize() + { + } + public void OnAfterDeserialize() { #if UNITY_EDITOR - if (k_AssetPreviousVersion != k_AssetVersion) + if (k_AssetVersion != 2) { EditorApplication.delayCall += () => UpgradeAsset(this.GetInstanceID()); } @@ -30,7 +35,21 @@ public void OnAfterDeserialize() #if UNITY_EDITOR static void UpgradeAsset(int assetInstanceID) { - UniversalRenderPipelineAsset asset = EditorUtility.InstanceIDToObject(assetInstanceID) as UniversalRenderPipelineAsset; + UniversalRenderPipelineGlobalSettings asset = EditorUtility.InstanceIDToObject(assetInstanceID) as UniversalRenderPipelineGlobalSettings; + + if (asset.k_AssetVersion < 2) + { +#pragma warning disable 618 // Obsolete warning + // Renamed supportRuntimeDebugDisplay => stripDebugVariants, which results in inverted logic + asset.m_StripDebugVariants = !asset.supportRuntimeDebugDisplay; + asset.k_AssetVersion = 2; +#pragma warning restore 618 // Obsolete warning + + // For old test projects lets keep post processing stripping enabled, as huge chance they did not used runtime profile creating +#if UNITY_INCLUDE_TESTS + asset.m_StripUnusedPostProcessingVariants = true; +#endif + } EditorUtility.SetDirty(asset); } @@ -296,11 +315,34 @@ internal void ResetRenderingLayerNames() #region Misc Settings + [SerializeField] bool m_StripDebugVariants = true; + + [SerializeField] bool m_StripUnusedPostProcessingVariants = false; + + [SerializeField] bool m_StripUnusedVariants = true; + /// /// Controls whether debug display shaders for Rendering Debugger are available in Player builds. /// + [Obsolete("Please use stripRuntimeDebugShaders instead.", false)] public bool supportRuntimeDebugDisplay = false; + /// + /// Controls whether debug display shaders for Rendering Debugger are available in Player builds. + /// + public bool stripDebugVariants { get => m_StripDebugVariants; set { m_StripDebugVariants = value; } } + + /// + /// Controls whether strips automatically post processing shader variants based on components. + /// It strips based on VolumeProfiles in project and not scenes that actually uses it. + /// + public bool stripUnusedPostProcessingVariants { get => m_StripUnusedPostProcessingVariants; set { m_StripUnusedPostProcessingVariants = value; } } + + /// + /// Controls whether strip off variants if the feature is enabled. + /// + public bool stripUnusedVariants { get => m_StripUnusedVariants; set { m_StripUnusedVariants = value; } } + #endregion } } diff --git a/com.unity.render-pipelines.universal/Shaders/Lit.shader b/com.unity.render-pipelines.universal/Shaders/Lit.shader index 2aa981cd884..fb085b39a26 100644 --- a/com.unity.render-pipelines.universal/Shaders/Lit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Lit.shader @@ -115,8 +115,6 @@ Shader "Universal Render Pipeline/Lit" // Universal Pipeline keywords #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION @@ -129,6 +127,8 @@ Shader "Universal Render Pipeline/Lit" // ------------------------------------- // Unity defined keywords + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON @@ -227,14 +227,14 @@ Shader "Universal Render Pipeline/Lit" #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION #pragma multi_compile_fragment _ _SHADOWS_SOFT - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3 #pragma multi_compile_fragment _ _LIGHT_LAYERS #pragma multi_compile_fragment _ _RENDER_PASS_ENABLED // ------------------------------------- // Unity defined keywords + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON @@ -425,8 +425,6 @@ Shader "Universal Render Pipeline/Lit" // Universal Pipeline keywords #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _SHADOWS_SOFT #pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION @@ -439,6 +437,8 @@ Shader "Universal Render Pipeline/Lit" // ------------------------------------- // Unity defined keywords + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile_fog diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader index 77e49a0149a..47c24003005 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader @@ -53,7 +53,7 @@ Shader "Universal Render Pipeline/Nature/SpeedTree8" #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS + #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION #pragma multi_compile_fragment _ _SHADOWS_SOFT diff --git a/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader b/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader index 3777130b059..96f8516e45b 100644 --- a/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader +++ b/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader @@ -180,8 +180,6 @@ Shader "Universal Render Pipeline/Simple Lit" //#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS //#pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _SHADOWS_SOFT - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3 #pragma multi_compile_fragment _ _LIGHT_LAYERS @@ -190,6 +188,8 @@ Shader "Universal Render Pipeline/Simple Lit" #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _GBUFFER_NORMALS_OCT #pragma multi_compile_fragment _ _RENDER_PASS_ENABLED diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader index 5a25cfcc353..2225c75bf96 100644 --- a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader +++ b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader @@ -25,7 +25,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass" // Universal Pipeline keywords #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS + #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _SHADOWS_SOFT #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING #pragma multi_compile _ SHADOWS_SHADOWMASK diff --git a/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader b/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader index 176f5874e49..ff8d122af33 100644 --- a/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader +++ b/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader @@ -78,7 +78,7 @@ Shader "Hidden/Universal Render Pipeline/ScreenSpaceShadows" HLSLPROGRAM #pragma multi_compile _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE - #pragma multi_compile _ _SHADOWS_SOFT + #pragma multi_compile_fragment _ _SHADOWS_SOFT #pragma vertex Vertex #pragma fragment Fragment From 9d962264b12bccc7e6f352e34de053d75d622839 Mon Sep 17 00:00:00 2001 From: JulienIgnace-Unity Date: Mon, 6 Sep 2021 13:44:53 +0200 Subject: [PATCH 120/149] Fixed obsolete API usage with latest trunk (#5522) * Fixed obsolete API usage with latest trunk * Bump min version --- com.unity.render-pipelines.core/package.json | 2 +- com.unity.render-pipelines.high-definition-config/package.json | 2 +- com.unity.render-pipelines.high-definition/package.json | 2 +- com.unity.render-pipelines.universal/package.json | 2 +- com.unity.shadergraph/package.json | 2 +- com.unity.visualeffectgraph/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.core/package.json b/com.unity.render-pipelines.core/package.json index 69dc8316ebf..47e7ac6431a 100644 --- a/com.unity.render-pipelines.core/package.json +++ b/com.unity.render-pipelines.core/package.json @@ -3,7 +3,7 @@ "description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.", "version": "13.0.0", "unity": "2022.1", - "unityRelease": "0a7", + "unityRelease": "0a8", "displayName": "Core RP Library", "dependencies": { "com.unity.ugui": "1.0.0", diff --git a/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.render-pipelines.high-definition-config/package.json index f06179393f1..87ea4d0e726 100644 --- a/com.unity.render-pipelines.high-definition-config/package.json +++ b/com.unity.render-pipelines.high-definition-config/package.json @@ -3,7 +3,7 @@ "description": "Configuration files for the High Definition Render Pipeline.", "version": "13.0.0", "unity": "2022.1", - "unityRelease": "0a7", + "unityRelease": "0a8", "displayName": "High Definition RP Config", "dependencies": { "com.unity.render-pipelines.core": "13.0.0" diff --git a/com.unity.render-pipelines.high-definition/package.json b/com.unity.render-pipelines.high-definition/package.json index 71a150b420d..fc89916300e 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": "13.0.0", "unity": "2022.1", - "unityRelease": "0a7", + "unityRelease": "0a8", "displayName": "High Definition RP", "dependencies": { "com.unity.mathematics": "1.2.1", diff --git a/com.unity.render-pipelines.universal/package.json b/com.unity.render-pipelines.universal/package.json index 5a33e0b2ad3..d69e97bdf92 100644 --- a/com.unity.render-pipelines.universal/package.json +++ b/com.unity.render-pipelines.universal/package.json @@ -3,7 +3,7 @@ "description": "The Universal Render Pipeline (URP) is a prebuilt Scriptable Render Pipeline, made by Unity. URP provides artist-friendly workflows that let you quickly and easily create optimized graphics across a range of platforms, from mobile to high-end consoles and PCs.", "version": "13.0.0", "unity": "2022.1", - "unityRelease": "0a7", + "unityRelease": "0a8", "displayName": "Universal RP", "dependencies": { "com.unity.mathematics": "1.2.1", diff --git a/com.unity.shadergraph/package.json b/com.unity.shadergraph/package.json index cfcc87f5cec..0dbf609428d 100644 --- a/com.unity.shadergraph/package.json +++ b/com.unity.shadergraph/package.json @@ -3,7 +3,7 @@ "description": "The Shader Graph package adds a visual Shader editing tool to Unity. You can use this tool to create Shaders in a visual way instead of writing code. Specific render pipelines can implement specific graph features. Currently, both the High Definition Rendering Pipeline and the Universal Rendering Pipeline support Shader Graph.", "version": "13.0.0", "unity": "2022.1", - "unityRelease": "0a7", + "unityRelease": "0a8", "displayName": "Shader Graph", "dependencies": { "com.unity.render-pipelines.core": "13.0.0", diff --git a/com.unity.visualeffectgraph/package.json b/com.unity.visualeffectgraph/package.json index bcd77892ffd..e244564fbc0 100644 --- a/com.unity.visualeffectgraph/package.json +++ b/com.unity.visualeffectgraph/package.json @@ -3,7 +3,7 @@ "displayName": "Visual Effect Graph", "version": "13.0.0", "unity": "2022.1", - "unityRelease": "0a7", + "unityRelease": "0a8", "description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.", "keywords": [ "vfx", From a99ed035eeabe98a6639737b9399dcad5f99aa41 Mon Sep 17 00:00:00 2001 From: anisunity <42026998+anisunity@users.noreply.github.com> Date: Mon, 6 Sep 2021 14:03:49 +0200 Subject: [PATCH 121/149] Fixed edge bleeding when rendering volumetric clouds. (#5534) --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Lighting/VolumetricLighting/VolumetricClouds.compute | 3 +++ 2 files changed, 4 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index f4b9de12707..97d43ebb61e 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) - Fixed light anchor min distance value + properties not working with prefabs (case 1345509). - Fixed specular occlusion sharpness and over darkening at grazing angles. +- Fixed edge bleeding when rendering volumetric clouds. ### changed - Visual Environment ambient mode is now Dynamic by default. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute index 37f652e4c6b..a61d4eeb013 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute @@ -850,6 +850,9 @@ void RenderClouds(uint3 traceCoord : SV_DispatchThreadID, uint2 groupThreadId : intermediateCoord = traceCoord.xy * 2; } + // Given that the rendering resolution is not guaranteed to be an even number, we need to clamp to the intermediate resolution in this case + intermediateCoord = min(intermediateCoord, _IntermediateScreenSize.xy - 1); + // Compute the offset that shall be used (if any) float offset = _EnableIntegration ? GetBNDSequenceSample(intermediateCoord, _AccumulationFrameIndex, 0) : 0.0; From ed9e5dab6c04b743816667ec375352de378a671d Mon Sep 17 00:00:00 2001 From: robin-demoor <60922742+robin-demoor@users.noreply.github.com> Date: Mon, 6 Sep 2021 16:17:21 +0200 Subject: [PATCH 122/149] Universal/swapbuffer afterpostprocess (#4892) * swapbuffer: Set _AfterPostProcessTexture * swapbuffer fix: chaneglog + formatting * Swapbuffer: disable MSAA during postProcessing * Swapbuffer: reset m_AllowMSAA after frame * Sync ScriptableRenderer targets after cmd.SetRenderTarget * Swapbuffer: fix camera stack with diferent renderers * Remove faulty test checks, formatting --- .../Assets/Test/Runtime/Renderer2DTests.cs | 9 -- .../CHANGELOG.md | 1 + .../Runtime/Passes/FinalBlitPass.cs | 2 + .../Runtime/Passes/PostProcessPass.cs | 45 +++++++-- .../Runtime/RenderTargetBufferSystem.cs | 98 ++++++++++++++----- .../Runtime/ScriptableRenderer.cs | 1 + .../Runtime/UniversalRenderer.cs | 10 +- 7 files changed, 125 insertions(+), 41 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs index 21b14e6f223..7a05a98f49f 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Renderer2DTests.cs @@ -54,10 +54,8 @@ public void BaseRendererDoesNotCreateRenderTexturesIfStackIsEmpty() return; Assert.IsFalse(baseRenderer.createColorTexture); - Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); Assert.IsFalse(baseRenderer.createDepthTexture); - Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget); } [Test] @@ -70,10 +68,8 @@ public void BaseRendererCreatesRenderTexturesIfStackIsNotEmpty() Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; Assert.IsTrue(baseRenderer.createColorTexture); - Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); Assert.IsTrue(baseRenderer.createDepthTexture); - Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget); } [Test] @@ -86,10 +82,8 @@ public void BaseRendererUsesDepthAttachmentOfColorTextureIfNoDepthTextureCreated Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; Assert.IsTrue(baseRenderer.createColorTexture); - Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget); Assert.IsFalse(baseRenderer.createDepthTexture); - Assert.AreEqual(baseRenderer.cameraColorTarget, baseRenderer.cameraDepthTarget); } [Test] @@ -101,9 +95,6 @@ public void OverlayRendererUsesRenderTexturesFromBase() Renderer2D baseRenderer = m_BaseCameraData.scriptableRenderer as Renderer2D; Renderer2D overlayRenderer = m_OverlayCameraData.scriptableRenderer as Renderer2D; - - Assert.AreEqual(baseRenderer.cameraColorTarget, overlayRenderer.cameraColorTarget); - Assert.AreEqual(baseRenderer.cameraDepthTarget, overlayRenderer.cameraDepthTarget); } [Test] diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index efc9d342d08..3e599a656e9 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -169,6 +169,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed unlit shader function name ambiguity - Fixed Terrain holes not appearing in shadows [case 1349305] - VFX: Compilation issue with ShaderGraph and planar lit outputs [case 1349894](https://issuetracker.unity3d.com/product/unity/issues/guid/1349894/) +- Fixed an issue where _AfterPostProcessTexture was no longer being assigned in UniversalRenderer. - Fixed an issue where TerrainLit was rendering color lighter than Lit [case 1340751] (https://issuetracker.unity3d.com/product/unity/issues/guid/1340751/) - Fixed Camera rendering when capture action and post processing present. [case 1350313] - Fixed artifacts in Speed Tree 8 billboard LODs due to SpeedTree LOD smoothing/crossfading [case 1348407] diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs index 72f516bb227..3b1f0cfb827 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs @@ -97,6 +97,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store, // color RenderBufferLoadAction.DontCare, RenderBufferStoreAction.DontCare); // depth cmd.Blit(m_Source, cameraTarget, m_BlitMaterial); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); } else { @@ -116,6 +117,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData cmd.SetViewport(cameraData.pixelRect); cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_BlitMaterial); cmd.SetViewProjectionMatrices(camera.worldToCameraMatrix, camera.projectionMatrix); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); } } diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index 619edfa04ff..4391cfec4cc 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -185,6 +185,8 @@ public void SetupFinalPass(in RenderTargetHandle source, bool useSwapBuffer = fa /// public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) { + overrideCameraTarget = true; + if (m_Destination == RenderTargetHandle.CameraTarget) return; @@ -329,6 +331,24 @@ void Render(CommandBuffer cmd, ref RenderingData renderingData) { ref CameraData cameraData = ref renderingData.cameraData; ref ScriptableRenderer renderer = ref cameraData.renderer; + bool isSceneViewCamera = cameraData.isSceneViewCamera; + + //Check amount of swaps we have to do + //We blit back and forth without msaa untill the last blit. + bool useStopNan = cameraData.isStopNaNEnabled && m_Materials.stopNaN != null; + bool useSubPixeMorpAA = cameraData.antialiasing == AntialiasingMode.SubpixelMorphologicalAntiAliasing && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES2; + var dofMaterial = m_DepthOfField.mode.value == DepthOfFieldMode.Gaussian ? m_Materials.gaussianDepthOfField : m_Materials.bokehDepthOfField; + bool useDepthOfField = m_DepthOfField.IsActive() && !isSceneViewCamera && dofMaterial != null; + bool useLensFlare = !LensFlareCommonSRP.Instance.IsEmpty(); + bool useMotionBlur = m_MotionBlur.IsActive() && !isSceneViewCamera; + bool usePaniniProjection = m_PaniniProjection.IsActive() && !isSceneViewCamera; + + int amountOfPassesRemaining = (useStopNan ? 1 : 0) + (useSubPixeMorpAA ? 1 : 0) + (useDepthOfField ? 1 : 0) + (useLensFlare ? 1 : 0) + (useMotionBlur ? 1 : 0) + (usePaniniProjection ? 1 : 0); + + if (m_UseSwapBuffer && amountOfPassesRemaining > 0) + { + renderer.EnableSwapBufferMSAA(false); + } // Don't use these directly unless you have a good reason to, use GetSource() and // GetDestination() instead @@ -336,7 +356,6 @@ void Render(CommandBuffer cmd, ref RenderingData renderingData) bool tempTarget2Used = false; RenderTargetIdentifier source = m_UseSwapBuffer ? renderer.cameraColorTarget : m_Source; RenderTargetIdentifier destination = m_UseSwapBuffer ? renderer.GetCameraColorFrontBuffer(cmd) : -1; - bool isSceneViewCamera = cameraData.isSceneViewCamera; RenderTargetIdentifier GetSource() => source; @@ -365,8 +384,15 @@ RenderTargetIdentifier GetDestination() void Swap(ref ScriptableRenderer r) { + --amountOfPassesRemaining; if (m_UseSwapBuffer) { + //we want the last blit to be to MSAA + if (amountOfPassesRemaining == 0 && !m_HasFinalPass) + { + r.EnableSwapBufferMSAA(true); + } + r.SwapColorBuffer(cmd); source = r.cameraColorTarget; destination = r.GetCameraColorFrontBuffer(cmd); @@ -382,7 +408,7 @@ void Swap(ref ScriptableRenderer r) // Optional NaN killer before post-processing kicks in // stopNaN may be null on Adreno 3xx. It doesn't support full shader level 3.5, but SystemInfo.graphicsShaderLevel is 35. - if (cameraData.isStopNaNEnabled && m_Materials.stopNaN != null) + if (useStopNan) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.StopNaNs))) { @@ -396,7 +422,7 @@ void Swap(ref ScriptableRenderer r) } // Anti-aliasing - if (cameraData.antialiasing == AntialiasingMode.SubpixelMorphologicalAntiAliasing && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES2) + if (useSubPixeMorpAA) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.SMAA))) { @@ -408,8 +434,7 @@ void Swap(ref ScriptableRenderer r) // Depth of Field // Adreno 3xx SystemInfo.graphicsShaderLevel is 35, but instancing support is disabled due to buggy drivers. // DOF shader uses #pragma target 3.5 which adds requirement for instancing support, thus marking the shader unsupported on those devices. - var dofMaterial = m_DepthOfField.mode.value == DepthOfFieldMode.Gaussian ? m_Materials.gaussianDepthOfField : m_Materials.bokehDepthOfField; - if (m_DepthOfField.IsActive() && !isSceneViewCamera && dofMaterial != null) + if (useDepthOfField) { var markerName = m_DepthOfField.mode.value == DepthOfFieldMode.Gaussian ? URPProfileId.GaussianDepthOfField @@ -423,7 +448,7 @@ void Swap(ref ScriptableRenderer r) } // Motion blur - if (m_MotionBlur.IsActive() && !isSceneViewCamera) + if (useMotionBlur) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.MotionBlur))) { @@ -434,7 +459,7 @@ void Swap(ref ScriptableRenderer r) // Panini projection is done as a fullscreen pass after all depth-based effects are done // and before bloom kicks in - if (m_PaniniProjection.IsActive() && !isSceneViewCamera) + if (usePaniniProjection) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.PaniniProjection))) { @@ -444,7 +469,7 @@ void Swap(ref ScriptableRenderer r) } // Lens Flare - if (!LensFlareCommonSRP.Instance.IsEmpty()) + if (useLensFlare) { bool usePanini; float paniniDistance; @@ -565,6 +590,7 @@ void Swap(ref ScriptableRenderer r) #endif { cmd.SetRenderTarget(cameraTarget, colorLoadAction, RenderBufferStoreAction.Store, RenderBufferLoadAction.DontCare, RenderBufferStoreAction.DontCare); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); if ((m_Destination == RenderTargetHandle.CameraTarget && !m_UseSwapBuffer) || m_ResolveToScreen) @@ -600,6 +626,8 @@ void Swap(ref ScriptableRenderer r) if (tempTarget2Used) cmd.ReleaseTemporaryRT(ShaderConstants._TempTarget2); + + cmd.ReleaseTemporaryRT(m_InternalLut.id); } } @@ -1401,6 +1429,7 @@ void RenderFinalPass(CommandBuffer cmd, ref RenderingData renderingData) cmd.SetViewport(cameraData.pixelRect); cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, material); cmd.SetViewProjectionMatrices(cameraData.camera.worldToCameraMatrix, cameraData.camera.projectionMatrix); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); } } diff --git a/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs b/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs index 4e3ab816297..222849288eb 100644 --- a/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs +++ b/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs @@ -10,68 +10,115 @@ namespace UnityEngine.Rendering.Universal.Internal //NOTE: This class is meant to be removed when RTHandles get implemented in urp internal sealed class RenderTargetBufferSystem { - RenderTargetHandle RTA; - RenderTargetHandle RTB; - bool m_FirstIsBackBuffer = true; - RenderTextureDescriptor m_Desc; - FilterMode m_FilterMode; - - int m_NameA; - int m_NameB; + struct SwapBuffer + { + public RenderTargetHandle rt; + public int name; + public int msaa; + } + SwapBuffer m_A, m_B; + static bool m_AisBackBuffer = true; + static RenderTextureDescriptor m_Desc; + FilterMode m_FilterMode; + bool m_AllowMSAA = true; bool m_RTisAllocated = false; + SwapBuffer backBuffer { get { return m_AisBackBuffer ? m_A : m_B; } } + SwapBuffer frontBuffer { get { return m_AisBackBuffer ? m_B : m_A; } } + public RenderTargetBufferSystem(string name) { - m_NameA = Shader.PropertyToID(name + "A"); - m_NameB = Shader.PropertyToID(name + "B"); - RTA.Init(name + "A"); - RTB.Init(name + "B"); + m_A.name = Shader.PropertyToID(name + "A"); + m_B.name = Shader.PropertyToID(name + "B"); + m_A.rt.Init(name + "A"); + m_B.rt.Init(name + "B"); } public RenderTargetHandle GetBackBuffer() { - return m_FirstIsBackBuffer ? RTA : RTB; + return backBuffer.rt; } public RenderTargetHandle GetBackBuffer(CommandBuffer cmd) { if (!m_RTisAllocated) Initialize(cmd); - return m_FirstIsBackBuffer ? RTA : RTB; + return backBuffer.rt; } public RenderTargetHandle GetFrontBuffer(CommandBuffer cmd) { if (!m_RTisAllocated) Initialize(cmd); - return m_FirstIsBackBuffer ? RTB : RTA; + + int pipelineMSAA = m_Desc.msaaSamples; + int bufferMSAA = frontBuffer.msaa; + + if (m_AllowMSAA && bufferMSAA != pipelineMSAA) + { + //We don't want a depth buffer on B buffer + var desc = m_Desc; + if (m_AisBackBuffer) + desc.depthBufferBits = 0; + + cmd.ReleaseTemporaryRT(frontBuffer.name); + cmd.GetTemporaryRT(frontBuffer.name, desc, m_FilterMode); + + if (m_AisBackBuffer) + m_B.msaa = desc.msaaSamples; + else m_A.msaa = desc.msaaSamples; + } + else if (!m_AllowMSAA && bufferMSAA > 1) + { + //We don't want a depth buffer on B buffer + var desc = m_Desc; + desc.msaaSamples = 1; + if (m_AisBackBuffer) + desc.depthBufferBits = 0; + + cmd.ReleaseTemporaryRT(frontBuffer.name); + cmd.GetTemporaryRT(frontBuffer.name, desc, m_FilterMode); + + if (m_AisBackBuffer) + m_B.msaa = desc.msaaSamples; + else m_A.msaa = desc.msaaSamples; + } + + return frontBuffer.rt; } public void Swap() { - m_FirstIsBackBuffer = !m_FirstIsBackBuffer; + m_AisBackBuffer = !m_AisBackBuffer; } void Initialize(CommandBuffer cmd) { - cmd.GetTemporaryRT(m_NameA, m_Desc, m_FilterMode); + m_A.msaa = m_Desc.msaaSamples; + m_B.msaa = m_Desc.msaaSamples; + + cmd.GetTemporaryRT(m_A.name, m_Desc, m_FilterMode); var descB = m_Desc; - descB.depthBufferBits = 0; - cmd.GetTemporaryRT(m_NameB, m_Desc, m_FilterMode); + //descB.depthBufferBits = 0; + cmd.GetTemporaryRT(m_B.name, descB, m_FilterMode); + m_RTisAllocated = true; } public void Clear(CommandBuffer cmd) { - cmd.ReleaseTemporaryRT(m_NameA); - cmd.ReleaseTemporaryRT(m_NameB); + cmd.ReleaseTemporaryRT(m_A.name); + cmd.ReleaseTemporaryRT(m_B.name); - m_FirstIsBackBuffer = true; + m_AisBackBuffer = true; + m_AllowMSAA = true; } public void SetCameraSettings(CommandBuffer cmd, RenderTextureDescriptor desc, FilterMode filterMode) { + Clear(cmd); //SetCameraSettings is called when new stack starts rendering. Make sure the targets are updated to use the new descriptor. + m_Desc = desc; m_FilterMode = filterMode; @@ -80,7 +127,12 @@ public void SetCameraSettings(CommandBuffer cmd, RenderTextureDescriptor desc, F public RenderTargetHandle GetBufferA() { - return RTA; + return m_A.rt; + } + + public void EnableMSAA(bool enable) + { + m_AllowMSAA = enable; } } } diff --git a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs index 66d8197edd5..a6ed15da98b 100644 --- a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs @@ -1320,6 +1320,7 @@ static void SetRenderTarget(CommandBuffer cmd, RenderTargetIdentifier[] colorAtt } internal virtual void SwapColorBuffer(CommandBuffer cmd) { } + internal virtual void EnableSwapBufferMSAA(bool enable) { } [Conditional("UNITY_EDITOR")] void DrawGizmos(ScriptableRenderContext context, Camera camera, GizmoSubset gizmoSubset) diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs index a92bebcf382..7abb3d146a1 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs @@ -122,7 +122,6 @@ private static class Profiling internal ColorGradingLutPass colorGradingLutPass { get => m_PostProcessPasses.colorGradingLutPass; } internal PostProcessPass postProcessPass { get => m_PostProcessPasses.postProcessPass; } internal PostProcessPass finalPostProcessPass { get => m_PostProcessPasses.finalPostProcessPass; } - internal RenderTargetHandle afterPostProcessColor { get => m_PostProcessPasses.afterPostProcessColor; } internal RenderTargetHandle colorGradingLut { get => m_PostProcessPasses.colorGradingLut; } internal DeferredLights deferredLights { get => m_DeferredLights; } @@ -1022,6 +1021,8 @@ void CreateCameraRenderTarget(ScriptableRenderContext context, ref RenderTexture m_ActiveCameraColorAttachment = m_ColorBufferSystem.GetBackBuffer(cmd); cmd.SetGlobalTexture("_CameraColorTexture", m_ActiveCameraColorAttachment.id); + //Set _AfterPostProcessTexture, users might still rely on this although it is now always the cameratarget due to swapbuffer + cmd.SetGlobalTexture("_AfterPostProcessTexture", m_ActiveCameraColorAttachment.id); } if (m_ActiveCameraDepthAttachment != RenderTargetHandle.CameraTarget) @@ -1130,11 +1131,18 @@ internal override void SwapColorBuffer(CommandBuffer cmd) m_ActiveCameraColorAttachment = m_ColorBufferSystem.GetBackBuffer(); cmd.SetGlobalTexture("_CameraColorTexture", m_ActiveCameraColorAttachment.id); + //Set _AfterPostProcessTexture, users might still rely on this although it is now always the cameratarget due to swapbuffer + cmd.SetGlobalTexture("_AfterPostProcessTexture", m_ActiveCameraColorAttachment.id); } internal override RenderTargetIdentifier GetCameraColorFrontBuffer(CommandBuffer cmd) { return m_ColorBufferSystem.GetFrontBuffer(cmd).id; } + + internal override void EnableSwapBufferMSAA(bool enable) + { + m_ColorBufferSystem.EnableMSAA(enable); + } } } From b9ba120327febbc57a9ea29e921b5a6622dbcfd9 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Mon, 6 Sep 2021 16:18:48 +0200 Subject: [PATCH 123/149] [VFX] Update test filter (remove deprecated) (#5524) * Remove https://jira.unity3d.com/browse/URP-723 * Fix missing update of testfilter in URP I forgot to remove https://jira.unity3d.com/browse/URP-723 --- .../Assets/TestCaseFilters.asset | 11 +---------- .../Assets/TestCaseFilters.asset | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset b/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset index 201697e1da8..4858e3530d2 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset @@ -15,16 +15,7 @@ MonoBehaviour: filters: - FilteredScene: {fileID: 0} FilteredScenes: - - {fileID: 102900000, guid: 6cf5bcccabd797d4db3c44a0d4ac7389, type: 3} - - {fileID: 102900000, guid: 7f721cad21da2c24aacb73377ebec462, type: 3} - ColorSpace: -1 - BuildPlatform: 33 - GraphicsDevice: 23 - XrSdk: - StereoModes: 0 - Reason: See https://jira.unity3d.com/browse/URP-723 - - FilteredScene: {fileID: 0} - FilteredScenes: + - {fileID: 102900000, guid: ebaa785ec5cfd50448e6b1fca17c280f, type: 3} - {fileID: 102900000, guid: ebaa785ec5cfd50448e6b1fca17c280f, type: 3} ColorSpace: -1 BuildPlatform: 31 diff --git a/TestProjects/VisualEffectGraph_URP/Assets/TestCaseFilters.asset b/TestProjects/VisualEffectGraph_URP/Assets/TestCaseFilters.asset index cc4a7dfff1e..b377a1a1471 100644 --- a/TestProjects/VisualEffectGraph_URP/Assets/TestCaseFilters.asset +++ b/TestProjects/VisualEffectGraph_URP/Assets/TestCaseFilters.asset @@ -13,15 +13,6 @@ MonoBehaviour: m_Name: TestCaseFilters m_EditorClassIdentifier: filters: - - FilteredScene: {fileID: 0} - FilteredScenes: - - {fileID: 102900000, guid: 6cf5bcccabd797d4db3c44a0d4ac7389, type: 3} - ColorSpace: -1 - BuildPlatform: 33 - GraphicsDevice: 23 - XrSdk: - StereoModes: 0 - Reason: See https://jira.unity3d.com/browse/URP-723 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: b20a840a0adf929419e19f13139e8fa3, type: 3} From 285d55f3b63a94e669f8a77521a899353a4c172c Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Mon, 6 Sep 2021 23:11:32 +0000 Subject: [PATCH 124/149] [CI] [trunk] Updated editor to 7d732cc5f38f1f0c4606935042f15fedfd26fd81 --- .yamato/_latest_editor_versions_trunk.metafile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 02c441f40a1..8bfb4c1fe05 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: - updated_at_UTC: '2021-09-04 23:31:29.876736' + updated_at_UTC: '2021-09-06 23:11:17.866693' changeset: - id: a6d7f27874c08c403d43e993bde1b93ce0ea2161 - date: '2021-09-04T21:12:24' + id: 7d732cc5f38f1f0c4606935042f15fedfd26fd81 + date: '2021-09-06T15:20:23' From ff55f569704f048a87345f01d371489d965ffded Mon Sep 17 00:00:00 2001 From: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com> Date: Tue, 7 Sep 2021 12:39:29 +0200 Subject: [PATCH 125/149] Implementing Menu Manager (#5547) --- .../Editor/MenuManager.cs | 79 +++++++++++++++++++ .../Editor/MenuManager.cs.meta | 11 +++ 2 files changed, 90 insertions(+) create mode 100644 com.unity.render-pipelines.core/Editor/MenuManager.cs create mode 100644 com.unity.render-pipelines.core/Editor/MenuManager.cs.meta diff --git a/com.unity.render-pipelines.core/Editor/MenuManager.cs b/com.unity.render-pipelines.core/Editor/MenuManager.cs new file mode 100644 index 00000000000..709d1fe00c1 --- /dev/null +++ b/com.unity.render-pipelines.core/Editor/MenuManager.cs @@ -0,0 +1,79 @@ +using System; +using System.Linq.Expressions; +using System.Reflection; + +namespace UnityEditor.Rendering +{ + /// + /// Contains a set of method to be able to manage Menu Items for the editor + /// + static class MenuManager + { + #region Add Menu Item + static Action> s_AddMenuItem = GetAddMenuItemMethod(); + static Action> GetAddMenuItemMethod() + { + MethodInfo addMenuItemMethodInfo = typeof(Menu).GetMethod("AddMenuItem", BindingFlags.Static | BindingFlags.NonPublic); + var nameParam = Expression.Parameter(typeof(string), "name"); + var shortcutParam = Expression.Parameter(typeof(string), "shortcut"); + var checkedParam = Expression.Parameter(typeof(bool), "checked"); + var priorityParam = Expression.Parameter(typeof(int), "priority"); + var executeParam = Expression.Parameter(typeof(Action), "execute"); + var validateParam = Expression.Parameter(typeof(Func), "validate"); + + var addMenuItemExpressionCall = Expression.Call(null, addMenuItemMethodInfo, + nameParam, + shortcutParam, + checkedParam, + priorityParam, + executeParam, + validateParam); + + return Expression.Lambda>>( + addMenuItemExpressionCall, + nameParam, + shortcutParam, + checkedParam, + priorityParam, + executeParam, + validateParam).Compile(); + } + + /// + /// Adds a menu Item to the editor + /// + /// The path to the menu item + /// The shortcut of the menu item + /// If the item can have an state, pressed or not + /// The priority of the menu item + /// The action that will be called once the menu item is pressed + /// The action that will be called to know if the menu itme is enabled + public static void AddMenuItem(string path, string shortcut, bool @checked, int priority, System.Action execute, System.Func validate) + { + s_AddMenuItem(path, shortcut, @checked, priority, execute, validate); + } + + #endregion + + #region Remove Menu Item + static Action s_RemoveMenuItem = GetRemoveMenuItemMethod(); + static Action GetRemoveMenuItemMethod() + { + MethodInfo removeMenuItemMethodInfo = typeof(Menu).GetMethod("RemoveMenuItem", BindingFlags.Static | BindingFlags.NonPublic); + var nameParam = Expression.Parameter(typeof(string), "name"); + return Expression.Lambda>( + Expression.Call(null, removeMenuItemMethodInfo, nameParam), + nameParam).Compile(); + } + #endregion + + /// + /// Removes a Menu item from the editor, if the path is not found it does nothing + /// + /// The path of the menu item to be removed + public static void RemoveMenuItem(string path) + { + s_RemoveMenuItem(path); + } + } +} diff --git a/com.unity.render-pipelines.core/Editor/MenuManager.cs.meta b/com.unity.render-pipelines.core/Editor/MenuManager.cs.meta new file mode 100644 index 00000000000..ac7bdfd5ea5 --- /dev/null +++ b/com.unity.render-pipelines.core/Editor/MenuManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 016ffaaf36db9a047ab182ffa07bb8de +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From ef27c23c1c29f5c9af56b2b6382cfe97abca3e54 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:54:55 +0000 Subject: [PATCH 126/149] [CI] [trunk] Updated editor to c38dc8e8a392174b75c353e843f77b2f30195187 --- .yamato/_latest_editor_versions_trunk.metafile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 8bfb4c1fe05..00a5213772f 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: - updated_at_UTC: '2021-09-06 23:11:17.866693' + updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 7d732cc5f38f1f0c4606935042f15fedfd26fd81 - date: '2021-09-06T15:20:23' + id: c38dc8e8a392174b75c353e843f77b2f30195187 + date: '2021-09-07T10:52:17' From b4d25b79a650b5e4b809eaac785b5423113a3945 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:54:56 +0000 Subject: [PATCH 127/149] [CI] [trunk] Updated editor to b673a89ae29b96df5aeb8a76ad6a1ac1a9f85e5d --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 00a5213772f..06009aaa1b1 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: c38dc8e8a392174b75c353e843f77b2f30195187 - date: '2021-09-07T10:52:17' + id: b673a89ae29b96df5aeb8a76ad6a1ac1a9f85e5d + date: '2021-09-07T10:52:55' From a4f4107534834f833a99e0a31329e7170b9d162f Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:54:57 +0000 Subject: [PATCH 128/149] [CI] [trunk] Updated editor to bfcc8a0b92e0282a64e1dfb534ae0fb511dfa033 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 06009aaa1b1..22f39afcf5e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: b673a89ae29b96df5aeb8a76ad6a1ac1a9f85e5d - date: '2021-09-07T10:52:55' + id: bfcc8a0b92e0282a64e1dfb534ae0fb511dfa033 + date: '2021-09-07T10:55:19' From cc1c49e4635bab3bba0389c01d0ce3d8d9e9ba18 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:54:59 +0000 Subject: [PATCH 129/149] [CI] [trunk] Updated editor to 1ad3fd02b2f00cae091d33230c1a16864e806103 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 22f39afcf5e..831400d77d0 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: bfcc8a0b92e0282a64e1dfb534ae0fb511dfa033 - date: '2021-09-07T10:55:19' + id: 1ad3fd02b2f00cae091d33230c1a16864e806103 + date: '2021-09-07T10:56:52' From 36c872503b073f9260e616c874a9d338c60d75df Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:00 +0000 Subject: [PATCH 130/149] [CI] [trunk] Updated editor to 8cd3c0da68be076bb23ef580d25e98055f592252 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 831400d77d0..f5b994a58ae 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 1ad3fd02b2f00cae091d33230c1a16864e806103 - date: '2021-09-07T10:56:52' + id: 8cd3c0da68be076bb23ef580d25e98055f592252 + date: '2021-09-07T10:58:33' From 9c7f4b6bb8a1e61316f84d3eba0b0ccf09c9e064 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:01 +0000 Subject: [PATCH 131/149] [CI] [trunk] Updated editor to 9ed7e8e1ca9d1f9552d516cdfac97b92ac75bb75 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index f5b994a58ae..099a3cb7a41 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 8cd3c0da68be076bb23ef580d25e98055f592252 - date: '2021-09-07T10:58:33' + id: 9ed7e8e1ca9d1f9552d516cdfac97b92ac75bb75 + date: '2021-09-07T10:59:33' From ced7dccf24065df4ee27f79cf69b3c412c6c3f24 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:02 +0000 Subject: [PATCH 132/149] [CI] [trunk] Updated editor to 347a027d411aa753d7a8f19ce86c8d870bef3b35 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 099a3cb7a41..9e9536b90a7 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 9ed7e8e1ca9d1f9552d516cdfac97b92ac75bb75 - date: '2021-09-07T10:59:33' + id: 347a027d411aa753d7a8f19ce86c8d870bef3b35 + date: '2021-09-07T11:01:26' From f4e28dfa9e77ad440b817660676a41081086c90e Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:04 +0000 Subject: [PATCH 133/149] [CI] [trunk] Updated editor to 3b615aa938b7bab722de0eba856ffcd986ec81b5 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 9e9536b90a7..1640b85f5d7 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 347a027d411aa753d7a8f19ce86c8d870bef3b35 - date: '2021-09-07T11:01:26' + id: 3b615aa938b7bab722de0eba856ffcd986ec81b5 + date: '2021-09-07T11:03:05' From c813ce7f90e2e2782227cd41381c8f24dce24645 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:05 +0000 Subject: [PATCH 134/149] [CI] [trunk] Updated editor to 236cd82a7004faa760b70135cb483903b95582c7 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 1640b85f5d7..edf1811773d 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 3b615aa938b7bab722de0eba856ffcd986ec81b5 - date: '2021-09-07T11:03:05' + id: 236cd82a7004faa760b70135cb483903b95582c7 + date: '2021-09-07T11:03:47' From acd1a4f09cd7b0903dfea70fac3a8162d99f2a1d Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:06 +0000 Subject: [PATCH 135/149] [CI] [trunk] Updated editor to dc05a6377d3efd9a9ac6fd0faae0cf623af3ac16 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index edf1811773d..2d473ae71c8 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 236cd82a7004faa760b70135cb483903b95582c7 - date: '2021-09-07T11:03:47' + id: dc05a6377d3efd9a9ac6fd0faae0cf623af3ac16 + date: '2021-09-07T11:05:16' From eb9aff1b4d28a533ec02c5d4a285caa8ad7954d2 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:08 +0000 Subject: [PATCH 136/149] [CI] [trunk] Updated editor to 27e1c3d1d02ebf20b2ad5f1a38fea9ab21eca094 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 2d473ae71c8..fd4ca899e3e 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: dc05a6377d3efd9a9ac6fd0faae0cf623af3ac16 - date: '2021-09-07T11:05:16' + id: 27e1c3d1d02ebf20b2ad5f1a38fea9ab21eca094 + date: '2021-09-07T11:05:42' From 687cba1093440ccddf4dcd0c27fa1657173aadaf Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:09 +0000 Subject: [PATCH 137/149] [CI] [trunk] Updated editor to c0ee35fe7323fd6d19f3592d94659624fa8a2d38 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index fd4ca899e3e..83a0337e3fc 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 27e1c3d1d02ebf20b2ad5f1a38fea9ab21eca094 - date: '2021-09-07T11:05:42' + id: c0ee35fe7323fd6d19f3592d94659624fa8a2d38 + date: '2021-09-07T11:07:13' From 29d84b9b19c9007af1d14af25150dd390c919dc8 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:10 +0000 Subject: [PATCH 138/149] [CI] [trunk] Updated editor to fa4a663611f95c20e7de01725f98597a5c150b66 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 83a0337e3fc..f6770420f04 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: c0ee35fe7323fd6d19f3592d94659624fa8a2d38 - date: '2021-09-07T11:07:13' + id: fa4a663611f95c20e7de01725f98597a5c150b66 + date: '2021-09-07T11:12:20' From e503b45df37df346507295c94ec6b3ac6ab7d889 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:11 +0000 Subject: [PATCH 139/149] [CI] [trunk] Updated editor to 4d10c92995d1c35cee7c818ec3964d8a1f614ff5 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index f6770420f04..b44084b37b7 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: fa4a663611f95c20e7de01725f98597a5c150b66 - date: '2021-09-07T11:12:20' + id: 4d10c92995d1c35cee7c818ec3964d8a1f614ff5 + date: '2021-09-07T11:13:52' From 6ffe10412f99fb9579a45e27c70f1917a6d54752 Mon Sep 17 00:00:00 2001 From: "noreply@unity3d.com" Date: Tue, 7 Sep 2021 23:55:13 +0000 Subject: [PATCH 140/149] [CI] [trunk] Updated editor to a5808e9d96061997a8217598a1e95310102b6bc5 --- .yamato/_latest_editor_versions_trunk.metafile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index b44084b37b7..16d83a53af6 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: 4d10c92995d1c35cee7c818ec3964d8a1f614ff5 - date: '2021-09-07T11:13:52' + id: a5808e9d96061997a8217598a1e95310102b6bc5 + date: '2021-09-07T11:14:25' From 0f853b2e84db2edb8dc4bb7cd28962ef0b6f999c Mon Sep 17 00:00:00 2001 From: Seongdae Kim <37893618+Seongdae@users.noreply.github.com> Date: Wed, 8 Sep 2021 10:30:32 +0900 Subject: [PATCH 141/149] Fix an issues of flickering in URP's deferred rendering mode (#5461) * Change render pass event in screen space shadows * Update CHANGELOG.md * Change render event by depending on rendering mode(forward or deferred) * Move 'isDeferredRenderingMode' inside if-condition * Update ScreenSpaceShadows.cs --- com.unity.render-pipelines.universal/CHANGELOG.md | 1 + .../Runtime/RendererFeatures/ScreenSpaceShadows.cs | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 3e599a656e9..bd99d9d8db4 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -177,6 +177,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Support undo of URP Global Settings asset assignation (case 1342987). - Removed unsupported fields from Presets of Light and Camera [case 1335979]. - Fixed graphical artefact when terrain height map is used with rendering layer mask for lighting. +- Fixed an issue where screen space shadows has flickering with deferred mode [case 1354681](https://issuetracker.unity3d.com/issues/screen-space-shadows-flicker-in-scene-view-when-using-deferred-rendering) ### Changed - Change Asset/Create/Shader/Universal Render Pipeline/Lit Shader Graph to Asset/Create/Shader Graph/URP/Lit Shader Graph diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs index 8a6768c574d..adfea370f63 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs @@ -34,7 +34,7 @@ public override void Create() LoadMaterial(); - m_SSShadowsPass.renderPassEvent = RenderPassEvent.AfterRenderingPrePasses; + m_SSShadowsPass.renderPassEvent = RenderPassEvent.AfterRenderingGbuffer; m_SSShadowsPostPass.renderPassEvent = RenderPassEvent.BeforeRenderingTransparents; } @@ -54,6 +54,12 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD if (shouldEnqueue) { + bool isDeferredRenderingMode = renderer is UniversalRenderer && ((UniversalRenderer)renderer).renderingMode == RenderingMode.Deferred; + + m_SSShadowsPass.renderPassEvent = isDeferredRenderingMode + ? RenderPassEvent.AfterRenderingGbuffer + : RenderPassEvent.AfterRenderingPrePasses; + renderer.EnqueuePass(m_SSShadowsPass); renderer.EnqueuePass(m_SSShadowsPostPass); } From 220518a4a30a32f8ff1df95383b0bb93bb8212aa Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Wed, 8 Sep 2021 09:42:20 +0200 Subject: [PATCH 142/149] Remove test (#5548) --- .../Tests/Editor/HDGlobalSettingsTests.cs | 79 ------------------ .../Editor/HDGlobalSettingsTests.cs.meta | 11 --- .../Editor/UniversalGlobalSettingsTests.cs | 81 ------------------- .../UniversalGlobalSettingsTests.cs.meta | 11 --- 4 files changed, 182 deletions(-) delete mode 100644 com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs delete mode 100644 com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta delete mode 100644 com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs delete mode 100644 com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta diff --git a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs b/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs deleted file mode 100644 index 8033e5fa2dc..00000000000 --- a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs +++ /dev/null @@ -1,79 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEditor.SceneManagement; - -namespace UnityEngine.Rendering.HighDefinition.Tests -{ - public class HDGlobalSettingsTests : MonoBehaviour - { - HDRenderPipelineGlobalSettings initialGlobalSettings; - HDRenderPipelineGlobalSettings otherGlobalSettings; - - - [SetUp] - public void SetUp() - { - UnityEditor.SceneManagement.EditorSceneManager.NewScene(UnityEditor.SceneManagement.NewSceneSetup.DefaultGameObjects); - otherGlobalSettings = ScriptableObject.CreateInstance(); - } - - [TearDown] - public void TearDown() - { - ScriptableObject.DestroyImmediate(otherGlobalSettings); - EditorSceneManager.NewScene(NewSceneSetup.EmptyScene); - } - - void EnsureHDRPIsActivePipeline() - { - Camera.main.Render(); - initialGlobalSettings = HDRenderPipelineGlobalSettings.instance; - Assert.IsInstanceOf(RenderPipelineManager.currentPipeline); - Assert.IsNotNull(initialGlobalSettings); - } - - [Test] - public void HDRPFrameRendered_GlobalSettingsShouldBeAssigned() - { - EnsureHDRPIsActivePipeline(); - } - - [Test] - public void HDRPFrameRendered_EnsureGlobalSettingsIfNullAssigned() - { - EnsureHDRPIsActivePipeline(); - - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(HDRenderPipelineGlobalSettings.instance); - - Camera.main.Render(); - Assert.IsNotNull(HDRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_HDRPActive_ChangeGlobalSettings() - { - EnsureHDRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(otherGlobalSettings); - Assert.AreEqual(otherGlobalSettings, HDRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, HDRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_HDRPActive_UnregisterGlobalSettings() - { - EnsureHDRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(HDRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, HDRenderPipelineGlobalSettings.instance); - } - } -} diff --git a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta b/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta deleted file mode 100644 index d31ddbdc735..00000000000 --- a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b1180ed5f2a1913498d7741201dd18bb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs b/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs deleted file mode 100644 index af7961394fe..00000000000 --- a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs +++ /dev/null @@ -1,81 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEditor.Rendering.Universal.Internal; -using UnityEngine.Experimental.Rendering.Universal; -using UnityEngine.TestTools; -using UnityEditor.SceneManagement; - -class UniversalGlobalSettingsTests -{ - UniversalRenderPipelineGlobalSettings initialGlobalSettings; - UniversalRenderPipelineGlobalSettings otherGlobalSettings; - - [SetUp] - public void SetUp() - { - UnityEditor.SceneManagement.EditorSceneManager.NewScene(UnityEditor.SceneManagement.NewSceneSetup.DefaultGameObjects); - otherGlobalSettings = ScriptableObject.CreateInstance(); - } - - [TearDown] - public void TearDown() - { - ScriptableObject.DestroyImmediate(otherGlobalSettings); - EditorSceneManager.NewScene(NewSceneSetup.EmptyScene); - } - - void EnsureUniversalRPIsActivePipeline() - { - Camera.main.Render(); - initialGlobalSettings = UniversalRenderPipelineGlobalSettings.instance; - Assert.IsInstanceOf(RenderPipelineManager.currentPipeline); - Assert.IsNotNull(initialGlobalSettings); - } - - [Test] - public void URPFrameRendered_GlobalSettingsShouldBeAssigned() - { - EnsureUniversalRPIsActivePipeline(); - } - - [Test] - public void URPFrameRendered_EnsureGlobalSettingsIfNullAssigned() - { - EnsureUniversalRPIsActivePipeline(); - - UniversalRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(UniversalRenderPipelineGlobalSettings.instance); - - Camera.main.Render(); - Assert.IsNotNull(UniversalRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_URPActive_ChangeGlobalSettings() - { - EnsureUniversalRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - UniversalRenderPipelineGlobalSettings.UpdateGraphicsSettings(otherGlobalSettings); - Assert.AreEqual(otherGlobalSettings, UniversalRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, UniversalRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_UPActive_UnregisterGlobalSettings() - { - EnsureUniversalRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - UniversalRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(UniversalRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, UniversalRenderPipelineGlobalSettings.instance); - } -} diff --git a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta b/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta deleted file mode 100644 index 27e60d2d3d5..00000000000 --- a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 59559b7e05a876a45bd815c6e5e874e3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 2a6f9af48db135e8f27d106fa3a71b7e37c090ae Mon Sep 17 00:00:00 2001 From: Kenny Tan <82013253+kennytann@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:54:48 +0800 Subject: [PATCH 143/149] update sub targets api (#5549) --- .../ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs | 4 ++-- .../2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs | 4 ++-- .../2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs index ac30e0c207c..f8a3c9f5257 100644 --- a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using UnityEditor.ShaderGraph; -using UnityEditor.UIElements; + namespace UnityEditor.Rendering.Universal.ShaderGraph { @@ -64,7 +64,7 @@ public override void GetActiveBlocks(ref TargetActiveBlockContext context) public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Action onChange, Action registerUndo) { - context.AddProperty("Blending Mode", new EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => + context.AddProperty("Blending Mode", new UnityEngine.UIElements.EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => { if (Equals(target.alphaMode, evt.newValue)) return; diff --git a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs index 55c571619c1..fe7a7309134 100644 --- a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEditor.ShaderGraph; using UnityEditor.ShaderGraph.Legacy; -using UnityEditor.UIElements; + namespace UnityEditor.Rendering.Universal.ShaderGraph { @@ -66,7 +66,7 @@ public override void GetActiveBlocks(ref TargetActiveBlockContext context) public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Action onChange, Action registerUndo) { - context.AddProperty("Blending Mode", new EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => + context.AddProperty("Blending Mode", new UnityEngine.UIElements.EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => { if (Equals(target.alphaMode, evt.newValue)) return; diff --git a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs index 72aa82744c8..adfe44a12da 100644 --- a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEditor.ShaderGraph; using UnityEditor.ShaderGraph.Legacy; -using UnityEditor.UIElements; + namespace UnityEditor.Rendering.Universal.ShaderGraph { @@ -64,7 +64,7 @@ public override void GetActiveBlocks(ref TargetActiveBlockContext context) public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Action onChange, Action registerUndo) { - context.AddProperty("Blending Mode", new EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => + context.AddProperty("Blending Mode", new UnityEngine.UIElements.EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => { if (Equals(target.alphaMode, evt.newValue)) return; From 88346ec551653bb9dea90ed797b6d8dc3de31529 Mon Sep 17 00:00:00 2001 From: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com> Date: Wed, 8 Sep 2021 11:06:42 +0200 Subject: [PATCH 144/149] SRP Workflows - New Additional Data Interface to be able to identify additional data's in Core Package (#5555) --- com.unity.render-pipelines.core/CHANGELOG.md | 1 + .../Runtime/Common/IAdditionalData.cs | 10 ++++++++++ .../Runtime/Common/IAdditionalData.cs.meta | 11 +++++++++++ .../Runtime/Lighting/Light/HDAdditionalLightData.cs | 2 +- .../Lighting/Reflection/HDAdditionalReflectionData.cs | 2 +- .../RenderPipeline/Camera/HDAdditionalCameraData.cs | 2 +- .../Runtime/UniversalAdditionalCameraData.cs | 2 +- .../Runtime/UniversalAdditionalLightData.cs | 2 +- 8 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs create mode 100644 com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 0a34553f239..d128a3bb6f6 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -50,6 +50,7 @@ The version number for this package has increased due to a version update of a r - Added class for drawing shadow cascades `UnityEditor.Rendering.ShadowCascadeGUI.DrawShadowCascades`. - Added UNITY_PREV_MATRIX_M and UNITY_PREV_MATRIX_I_M shader macros to support instanced motion vector rendering - Added new API to customize the rtHandleProperties of a particular RTHandle. This is a temporary work around to assist with viewport setup of Custom post process when dealing with DLSS or TAAU +- Added `IAdditionalData` interface to identify the additional datas on the core package. ### Fixed - Help boxes with fix buttons do not crop the label. diff --git a/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs new file mode 100644 index 00000000000..ccd428ec08a --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs @@ -0,0 +1,10 @@ + +namespace UnityEngine.Rendering +{ + /// + /// Interface to identify additional data components + /// + public interface IAdditionalData + { + } +} diff --git a/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta new file mode 100644 index 00000000000..f12e5691735 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 387193679abe1894fa3e4edf840e8932 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs index 175c7d92ce4..37bae930a9e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs @@ -33,7 +33,7 @@ struct TimelineWorkaround [AddComponentMenu("")] // Hide in menu [RequireComponent(typeof(Light))] [ExecuteAlways] - public partial class HDAdditionalLightData : MonoBehaviour, ISerializationCallbackReceiver + public partial class HDAdditionalLightData : MonoBehaviour, ISerializationCallbackReceiver, IAdditionalData { internal const float k_MinLightSize = 0.01f; // Provide a small size of 1cm for line light diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs index ad46bef5a35..3c8bfee527d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs @@ -6,7 +6,7 @@ namespace UnityEngine.Rendering.HighDefinition [HDRPHelpURLAttribute("Reflection-Probe")] [AddComponentMenu("")] // Hide in menu [RequireComponent(typeof(ReflectionProbe))] - public sealed partial class HDAdditionalReflectionData : HDProbe + public sealed partial class HDAdditionalReflectionData : HDProbe, IAdditionalData { void Awake() { diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs index 1e78578ee5d..992d363d210 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs @@ -158,7 +158,7 @@ public static HDPhysicalCamera GetDefaults() [AddComponentMenu("")] // Hide in menu [DisallowMultipleComponent, ExecuteAlways] [RequireComponent(typeof(Camera))] - public partial class HDAdditionalCameraData : MonoBehaviour, IFrameSettingsHistoryContainer + public partial class HDAdditionalCameraData : MonoBehaviour, IFrameSettingsHistoryContainer, IAdditionalData { /// /// How the camera should handle vertically flipping the frame at the end of rendering. diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs index bda4e11e1fc..5c24e4a26b2 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs @@ -212,7 +212,7 @@ public static string GetName(this CameraRenderType type) [RequireComponent(typeof(Camera))] [ImageEffectAllowedInSceneView] [URPHelpURL("universal-additional-camera-data")] - public class UniversalAdditionalCameraData : MonoBehaviour, ISerializationCallbackReceiver + public class UniversalAdditionalCameraData : MonoBehaviour, ISerializationCallbackReceiver, IAdditionalData { const string k_GizmoPath = "Packages/com.unity.render-pipelines.universal/Editor/Gizmos/"; const string k_BaseCameraGizmoPath = k_GizmoPath + "Camera_Base.png"; diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs index 20f40b977e0..58591778e48 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs @@ -54,7 +54,7 @@ public static UniversalAdditionalLightData GetUniversalAdditionalLightData(this [DisallowMultipleComponent] [RequireComponent(typeof(Light))] [URPHelpURL("universal-additional-light-data")] - public class UniversalAdditionalLightData : MonoBehaviour + public class UniversalAdditionalLightData : MonoBehaviour, IAdditionalData { // Version 0 means serialized data before the version field. [SerializeField] int m_Version = 1; From 370fcc1978755e8869ac8471004ed498e9cc34a3 Mon Sep 17 00:00:00 2001 From: julienamsellem <85612173+julienamsellem@users.noreply.github.com> Date: Wed, 8 Sep 2021 11:56:53 +0200 Subject: [PATCH 145/149] Vfx/fix/1340654 multiline tooltip output properties (#5504) * Subgraph output properties tootltips where not easily editable when multiline * Updated changelog --- com.unity.visualeffectgraph/CHANGELOG.md | 1 + .../Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md index dd834fa5a48..8aa3b070d02 100644 --- a/com.unity.visualeffectgraph/CHANGELOG.md +++ b/com.unity.visualeffectgraph/CHANGELOG.md @@ -103,6 +103,7 @@ The version number for this package has increased due to a version update of a r - Fix compilation failure on OpenGLES [Case 1348666](https://issuetracker.unity3d.com/product/unity/issues/guid/1348666/) - Don't open an empty VFX Graph Editor when assigning a VFX Asset to a Visual Effect GameObject from the inspector [Case 1347399](https://issuetracker.unity3d.com/product/unity/issues/guid/1347399/) - Visual Effect inspector input fields don't lose focus anymore while typing (Random seed) +- Subgraph output properties tooltips were not easily editable when multiline ## [11.0.0] - 2020-10-21 ### Added diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs b/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs index 032260495f6..4caafbef1c4 100644 --- a/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs +++ b/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs @@ -308,6 +308,8 @@ public void SelfChange(int change) if (m_TooltipProperty == null) { m_TooltipProperty = new StringPropertyRM(new SimplePropertyRMProvider("Tooltip", () => controller.model.tooltip, t => controller.model.tooltip = t), 55); + TextField field = m_TooltipProperty.Query(); + field.multiline = true; } Insert(insertIndex++, m_TooltipProperty); } From 74d95cb4b907db9e5ddb303c9763e377c0f430b3 Mon Sep 17 00:00:00 2001 From: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com> Date: Wed, 8 Sep 2021 13:19:46 +0200 Subject: [PATCH 146/149] Fix invalid cast exception (#5561) --- .../CHANGELOG.md | 1 + .../Runtime/Lighting/Reflection/HDProbe.cs | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 97d43ebb61e..826a0431c39 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -243,6 +243,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed missing API documentation for LTC area light code. - Fixed diffusion profile breaking after upgrading HDRP (case 1337892). - Fixed undo on light anchor. +- Fixed invalid cast exception on HDProbe. - Fixed some depth comparison instabilities with volumetric clouds. - Fixed AxF debug output in certain configurations (case 1333780). - Fixed white flash when camera is reset and SSR Accumulation mode is on. 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 8afa36e268f..e0daa581c7e 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 @@ -633,15 +633,11 @@ private Vector3 ComputeCapturePositionWS() private void QueueSHBaking() { - var hdrp = (HDRenderPipeline)RenderPipelineManager.currentPipeline; - if (hdrp != null) - { - if (!hdrp.currentPlatformRenderPipelineSettings.supportProbeVolume) return; - } - else - { + if (!(RenderPipelineManager.currentPipeline is HDRenderPipeline hdrp)) + return; + + if (!hdrp.currentPlatformRenderPipelineSettings.supportProbeVolume) return; - } Vector3 capturePositionWS = ComputeCapturePositionWS(); if (m_SHRequestID < 0) From 8f527240a773aba8005536f31fe84dad9b78f74b Mon Sep 17 00:00:00 2001 From: Jonas Mortensen Date: Wed, 8 Sep 2021 16:15:01 +0200 Subject: [PATCH 147/149] Updated minDistance epsilon URP decal (#5325) Merged with a few expected tests failing --- .../Runtime/Decal/Entities/DecalUpdateCachedSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs b/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs index b3d680d8449..5823c692c9d 100644 --- a/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs +++ b/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs @@ -174,7 +174,7 @@ private void Execute(DecalEntityChunk entityChunk, DecalCachedChunk cachedChunk, decalToWorlds = cachedChunk.decalToWorlds, normalToWorlds = cachedChunk.normalToWorlds, boundingSpheres = cachedChunk.boundingSpheres, - minDistance = 0.0001f, + minDistance = System.Single.Epsilon, }; var handle = updateTransformJob.Schedule(entityChunk.transformAccessArray); From 793949bb7623aec71f5e816b317e63661a2b5f3f Mon Sep 17 00:00:00 2001 From: Fabien Houlmann <44069206+fabien-unity@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:36:39 -0400 Subject: [PATCH 148/149] Enable DXR test 108 in XR mode (#5568) --- .../Assets/Scenes/108_Emissive_Perf_Exposure_0.unity | 4 ++-- .../Assets/Scenes/108_Emissive_Perf_Exposure_12.unity | 2 +- .../Assets/Scenes/108_Emissive_Perf_Exposure_15.unity | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_0.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_0.unity index 9f5460ecc2a..b8d9169e063 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_0.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_0.unity @@ -2627,8 +2627,8 @@ MonoBehaviour: m_Calls: [] captureFramerate: 0 waitFrames: 0 - xrCompatible: 0 - xrThresholdMultiplier: 1 + xrCompatible: 1 + xrThresholdMultiplier: 3 checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: 14a0f3aaa5e78a3439ec76d270471ebe, type: 2} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_12.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_12.unity index 42f4df0c102..3922ed0f767 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_12.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_12.unity @@ -2627,7 +2627,7 @@ MonoBehaviour: m_Calls: [] captureFramerate: 0 waitFrames: 0 - xrCompatible: 0 + xrCompatible: 1 xrThresholdMultiplier: 1 checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: 14a0f3aaa5e78a3439ec76d270471ebe, diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_15.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_15.unity index 58f473ae13a..9e2d812c505 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_15.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/108_Emissive_Perf_Exposure_15.unity @@ -2627,7 +2627,7 @@ MonoBehaviour: m_Calls: [] captureFramerate: 0 waitFrames: 0 - xrCompatible: 0 + xrCompatible: 1 xrThresholdMultiplier: 1 checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: 14a0f3aaa5e78a3439ec76d270471ebe, From 47bf604c19b3139d073c9c0183f70a8281bcbc46 Mon Sep 17 00:00:00 2001 From: Oleksandr Kokoshyn Date: Mon, 27 Sep 2021 14:33:43 +0200 Subject: [PATCH 149/149] Backported #5395: Added the How-to section and the XR blit example. --- .../forward-renderer-asset.png | 3 + .../mock-hmd-render-mode.png | 3 + .../how-to-blit-in-xr/new-render-feature.png | 3 + .../render-obj-cube-color-output.PNG | 3 + .../render-obj-cube-depth-output.png | 3 + .../how-to-blit-in-xr/renderobj-cube.png | 3 + .../how-to/blit-xr/add-renderer-feature.png | 3 + .../Images/how-to/blit-xr/example-scene.png | 3 + .../how-to/blit-xr/final-play-mode-view.png | 3 + .../blit-xr/final-scene-and-game-view.png | 3 + .../how-to/blit-xr/urp-global-settings.png | 3 + .../how-to/blit-xr/xr-plugin-mockhmd.png | 3 + .../Documentation~/TableOfContents.md | 3 + .../how-to-custom-effect-render-objects.md | 1 + .../Documentation~/how-to.md | 9 + ...-to-do-fullscreen-blitting-under-XR-SPI.md | 207 ++++++++++++++++ .../how-to-fullscreen-blit-in-xr-spi.md | 223 ++++++++++++++++++ 17 files changed, 479 insertions(+) create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png create mode 100644 com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md create mode 100644 com.unity.render-pipelines.universal/Documentation~/how-to.md create mode 100644 com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md create mode 100644 com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png new file mode 100644 index 00000000000..f1ce540fd62 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c70f9272f40e47570f20a3d743359a15253a8ff4d40db81d74470564cf36db5 +size 10237 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png new file mode 100644 index 00000000000..caf935cebdb --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aa1785e8b69085644ad7520a050f6fc790628e4aa6d589214b540e30dea3d0b +size 13199 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png new file mode 100644 index 00000000000..5cf707f5018 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:334cdde46b22acd6628c5c54998c56b07cbd43cd0b87e2d43ba28ca8bd0c342e +size 16457 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG new file mode 100644 index 00000000000..3de6f9432c6 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ca13962144f56cea5f05c0c8450e97de70761ed6b3bf666e7d079590df863f8 +size 20560 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png new file mode 100644 index 00000000000..75006daf01c --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddb73b3df55756e9c5a02a746fab73135830899164b72063d3d8e6524513d24f +size 8832 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png new file mode 100644 index 00000000000..0e49666350d --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f58d72352396b0a5b5896ceba3903847af3785a3ba851020c653081cfc12cee7 +size 68451 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png new file mode 100644 index 00000000000..2a0d4d24fc1 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d3edf0da3bd8f9eff30b194a0bb2d8d3b5860956364d285de67c1bc2c2839c7 +size 10316 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png new file mode 100644 index 00000000000..4a73a7877c4 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:145fe1e74e3e970001deeab54a1019f33833eacb65f1a43fa1454a0a5694c45f +size 76093 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png new file mode 100644 index 00000000000..333632264ce --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29c78fce43cb97ef70a1f18cb03ec54b70b02c659c28507a64ea35cdcff9aa53 +size 30797 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png new file mode 100644 index 00000000000..a3d0c1f8d48 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de1cd60376d5c49c2755e9f931fa9e3f166dccf728c0321e1de58ec48420d9c4 +size 43015 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png new file mode 100644 index 00000000000..d9d927a06f5 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a43d342fda0ad5c3ed51182781db484b1e2351513b8d39b0cdf07d49e09b2d6 +size 32636 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png new file mode 100644 index 00000000000..063317ef68a --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf43b18e5a052f31d1d4f7741304195be289f65f031c9cc1dfdbdcba69b3d860 +size 20176 diff --git a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md index c4d5eb3aa07..d8b409aa25a 100644 --- a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md +++ b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md @@ -94,6 +94,9 @@ * [Visualizing normal vectors](writing-shaders-urp-unlit-normals.md) * [Reconstruct the world space positions](writing-shaders-urp-reconstruct-world-position.md) * [URP ShaderLab Pass tags](urp-shaders/urp-shaderlab-pass-tags.md) +* [How to](how-to.md) + * [Blit in XR](renderer-features/how-to-fullscreen-blit-in-xr-spi.md) + * [Use Render Objects Renderer Feature](containers/how-to-custom-effect-render-objects.md) * [Customizing URP](customizing-urp.md) * [beginCameraRendering event](using-begincamerarendering.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md b/com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md new file mode 100644 index 00000000000..92e132f76ea --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md @@ -0,0 +1 @@ +[!include[](../renderer-features/how-to-custom-effect-render-objects.md)] diff --git a/com.unity.render-pipelines.universal/Documentation~/how-to.md b/com.unity.render-pipelines.universal/Documentation~/how-to.md new file mode 100644 index 00000000000..a15d6cc3404 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/how-to.md @@ -0,0 +1,9 @@ +# Practical how-to guides + +This section contains practical how-to guides. + +The section contains the following topics: + +* [How to perform a full screen blit in Single Pass Instanced rendering in XR](renderer-features/how-to-fullscreen-blit-in-xr-spi.md). + +* [How to create a custom rendering effect using the Render Objects Renderer Feature](containers/how-to-custom-effect-render-objects.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md new file mode 100644 index 00000000000..3bbc8d5c727 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md @@ -0,0 +1,207 @@ +# Example: How to create a full screen blitting feature under Single Pass Instanced rendering in XR + +The example on this page describes how to create a custom scriptable rendering feature doing full screen blit in XR + +## Example overview + +This example adds a ScriptableRenderPass that blits ScriptableRenderPassInput.Color to the CameraColorTarget. It uses the command buffer to draw a full screen mesh for both eyes. +The example also includes a shader used to perform the GPU side of the rendering, which works by sampling the color buffer using XR sampler macros. + +## Prerequisites + +This example requires the following: + +* A Unity project with the URP package installed. + +* The **Scriptable Render Pipeline Settings** property refers to a URP asset (**Project Settings** > **Graphics** > **Scriptable Render Pipeline Settings**). + +## Create example Scene and GameObjects + +To follow the steps in this example, create a new Scene with the following GameObjects: + +1. Create a Cube. + + ![Scene Cube](../Images/how-to-blit-in-xr/renderobj-cube.png) + +Now you have the setup necessary to follow the steps in this example. + +## Example implementation + +This section assumes that you created a Scene as described in section [Example Scene and GameObjects](#example-objects). + +The example implementation uses Scriptable Renderer Features: to draw color buffer information on screen. + +### Create a Renderer Feature and configure both input and output + +Follow these steps to create a Renderer Feature + +1. Create a new feature under the project asset folder. In this example, we name the file `ColorBlitRendererFeature.cs`. +```cs +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +internal class ColorBlitRendererFeature : ScriptableRendererFeature +{ + public Shader m_Shader; + public float m_Intensity; + + Material m_Material; + + ColorBlitPass m_RenderPass = null; + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + if (renderingData.cameraData.cameraType == CameraType.Game) + { + m_RenderPass.ConfigureInput(ScriptableRenderPassInput.Color); + m_RenderPass.SetTarget(renderer.cameraColorTarget, m_Intensity); + renderer.EnqueuePass(m_RenderPass); + } + } + + public override void Create() + { + if (m_Shader != null) + m_Material = new Material(m_Shader); + + m_RenderPass = new ColorBlitPass(m_Material); + } + + protected override void Dispose(bool disposing) + { + CoreUtils.Destroy(m_Material); + } +} + +``` +2. Create the scriptable render pass that issue the custom blit draw call. In this example, we name the file `ColorBlitPass.cs` +In this example, we use `cmd.DrawMesh` to draw a fullscreen quad that performs the blit operation. +Do **Not** use the `cmd.Blit` in URP XR as it has serveral compatibility issues with URP XR integration and it may enable/disable XR shader keyword behind the scene which breaks XR SPI rendering. +```cs +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +internal class ColorBlitPass : ScriptableRenderPass +{ + ProfilingSampler m_ProfilingSampler = new ProfilingSampler("ColorBlit"); + Material m_Material; + RenderTargetIdentifier m_CameraColorTarget; + float m_intensity; + + public ColorBlitPass(Material material) + { + m_Material = material; + renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing; + } + + public void SetTarget(RenderTargetIdentifier colorHandle, float intensity) + { + m_CameraColorTarget = colorHandle; + m_intensity = intensity; + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + var camera = renderingData.cameraData.camera; + if (camera.cameraType != CameraType.Game) + return; + + if (m_Material == null) + return; + + CommandBuffer cmd = CommandBufferPool.Get(); + using (new ProfilingScope(cmd, m_ProfilingSampler)) + { + m_Material.SetFloat("_Intensity", m_intensity); + cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorTarget, 0, CubemapFace.Unknown, -1)); + cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_Material); + } + context.ExecuteCommandBuffer(cmd); + cmd.Clear(); + + CommandBufferPool.Release(cmd); + } +} +``` +3. Create the shader that performs the blit operation. In this example, we name the file `ColorBlit.shader`. The vertex stage outputs the fullscreen quad position. The fragment stage samples color buffer and writes out the `color*intencity` value to the render target. +```hlsl +Shader "ColorBlit" +{ + SubShader + { + Tags { "RenderType"="Opaque" "RenderPipeline" = "UniversalPipeline"} + LOD 100 + ZTest Always ZWrite Off Cull Off + Pass + { + Name "ColorBlitPass" + + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 positionHCS : POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_OUTPUT_STEREO + }; + + Varyings vert(Attributes input) + { + Varyings output; + UNITY_SETUP_INSTANCE_ID(input); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); + + // Note: The pass is setup with a mesh already in CS + // Therefore, we can just output vertex position + output.positionCS = float4(input.positionHCS.xyz, 1.0); + + #if UNITY_UV_STARTS_AT_TOP + output.positionCS.y *= -1; + #endif + + output.uv = input.uv; + return output; + } + + TEXTURE2D_X(_CameraOpaqueTexture); + SAMPLER(sampler_CameraOpaqueTexture); + + float _Intensity; + + half4 frag (Varyings input) : SV_Target + { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + float4 color = SAMPLE_TEXTURE2D_X(_CameraOpaqueTexture, sampler_CameraOpaqueTexture, input.uv); + return color * _Intensity; + } + ENDHLSL + } + } +} +``` +4. Select forward renderer. + + ![Select Forward Renderer](../Images/how-to-blit-in-xr/forward-renderer-asset.png) + +7. Configure forward renderer to use the new render feature and set the intencity to 1.5. + + ![Configure New Renderer Feature](../Images/how-to-blit-in-xr/new-render-feature.png) + +6. Configure project to use XRSDK. Add mock hmd provider and select single pass instanced as rendering mode. + + ![Configure MockHMD](../Images/how-to-blit-in-xr/mock-hmd-render-mode.png) + +The example is complete. When running in playmode, color buffer is displayed. +![Color Output](../Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG) diff --git a/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md new file mode 100644 index 00000000000..70ef1ea6072 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md @@ -0,0 +1,223 @@ +# How to perform a full screen blit in Single Pass Instanced rendering in XR + +The example on this page describes how to create a custom Renderer Feature that performs a full screen blit in Single Pass Instanced rendering in XR. + +## Example overview + +This example implements the following solution: + +* A [custom Renderer Feature](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRendererFeature.html) calls a custom [Render Pass](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRenderPass.html). + +* The [Render Pass](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRenderPass.html) blits the Opaque Texture to the the [Camera color target](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@7.0/api/UnityEngine.Rendering.Universal.ScriptableRenderer.html#UnityEngine_Rendering_Universal_ScriptableRenderer_cameraColorTarget) for the current renderer. The render pass uses the command buffer to draw a full screen mesh for both eyes. + +The example includes [the shader](#shader) that performs the GPU side of the rendering. The shader samples the color buffer using XR sampler macros. + +## Prerequisites + +This example requires the following: + +* The **Scriptable Render Pipeline Settings** property refers to a URP asset (**Project Settings** > **Graphics** > **Scriptable Render Pipeline Settings**). + +## Create example Scene and GameObjects + +To follow the steps in this example, create a new Scene with the following GameObjects: + +1. Create a Cube. Ensure that the Cube is clearly visible from the main Camera. + + ![](../Images/how-to/blit-xr/example-scene.png) + +Now you have the Scene necessary to follow the steps in this example. + +## Example implementation + +This section assumes that you created a Scene as described in section [Create example Scene and GameObjects](#example-objects). + +Follow these steps to create a [custom Renderer Feature](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRendererFeature.html) with a custom [Render Pass](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRenderPass.html). + +1. Create a new C# script. Call it `ColorBlitRendererFeature.cs`. This script implements the custom Renderer Feature. + + ```C# + using UnityEngine; + using UnityEngine.Rendering; + using UnityEngine.Rendering.Universal; + + internal class ColorBlitRendererFeature : ScriptableRendererFeature + { + public Shader m_Shader; + public float m_Intensity; + + Material m_Material; + + ColorBlitPass m_RenderPass = null; + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + if (renderingData.cameraData.cameraType == CameraType.Game) + { + //Calling ConfigureInput with the ScriptableRenderPassInput.Color argument ensures that the opaque texture is available to the Render Pass + m_RenderPass.ConfigureInput(ScriptableRenderPassInput.Color); + m_RenderPass.SetTarget(renderer.cameraColorTarget, m_Intensity); + renderer.EnqueuePass(m_RenderPass); + } + } + + public override void Create() + { + if (m_Shader != null) + m_Material = new Material(m_Shader); + + m_RenderPass = new ColorBlitPass(m_Material); + } + + protected override void Dispose(bool disposing) + { + CoreUtils.Destroy(m_Material); + } + } + ``` + +2. Create a new C# script. Call it `ColorBlitPass.cs`. This script implements the custom Render Pass that performs the custom blit draw call. + + This Render Pass uses the `cmd.DrawMesh` method to draw a full-screen quad and perform the blit operation. + + > **NOTE:** Do not use the `cmd.Blit` method in URP XR projects because that method has compatibility issues with the URP XR integration. Using `cmd.Blit` might implicitly enable or disable XR shader keywords, which breaks XR SPI rendering. + + ```C# + using UnityEngine; + using UnityEngine.Rendering; + using UnityEngine.Rendering.Universal; + + internal class ColorBlitPass : ScriptableRenderPass + { + ProfilingSampler m_ProfilingSampler = new ProfilingSampler("ColorBlit"); + Material m_Material; + RenderTargetIdentifier m_CameraColorTarget; + float m_Intensity; + + public ColorBlitPass(Material material) + { + m_Material = material; + renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing; + } + + public void SetTarget(RenderTargetIdentifier colorHandle, float intensity) + { + m_CameraColorTarget = colorHandle; + m_Intensity = intensity; + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + var camera = renderingData.cameraData.camera; + if (camera.cameraType != CameraType.Game) + return; + + if (m_Material == null) + return; + + CommandBuffer cmd = CommandBufferPool.Get(); + using (new ProfilingScope(cmd, m_ProfilingSampler)) + { + m_Material.SetFloat("_Intensity", m_Intensity); + cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorTarget, 0, CubemapFace.Unknown, -1)); + //The RenderingUtils.fullscreenMesh argument specifies that the mesh to draw is a quad. + cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_Material); + } + context.ExecuteCommandBuffer(cmd); + cmd.Clear(); + + CommandBufferPool.Release(cmd); + } + } + ``` + +3. Create the shader that performs the blit operation. Call the shader file `ColorBlit.shader`. The vertex function outputs the full-screen quad position. The fragment function samples the color buffer and returns the `color * float4(0, _Intensity, 0, 1)` value to the render target. + + ```hlsl + Shader "ColorBlit" + { + SubShader + { + Tags { "RenderType"="Opaque" "RenderPipeline" = "UniversalPipeline"} + LOD 100 + ZWrite Off Cull Off + Pass + { + Name "ColorBlitPass" + + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 positionHCS : POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_OUTPUT_STEREO + }; + + Varyings vert(Attributes input) + { + Varyings output; + UNITY_SETUP_INSTANCE_ID(input); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); + + // Note: The pass is setup with a mesh already in clip + // space, that's why, it's enough to just output vertex + // positions + output.positionCS = float4(input.positionHCS.xyz, 1.0); + + #if UNITY_UV_STARTS_AT_TOP + output.positionCS.y *= -1; + #endif + + output.uv = input.uv; + return output; + } + + TEXTURE2D_X(_CameraOpaqueTexture); + SAMPLER(sampler_CameraOpaqueTexture); + + float _Intensity; + + half4 frag (Varyings input) : SV_Target + { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + float4 color = SAMPLE_TEXTURE2D_X(_CameraOpaqueTexture, sampler_CameraOpaqueTexture, input.uv); + return color * float4(0, _Intensity, 0, 1); + } + ENDHLSL + } + } + } + ``` + +4. Add the `ColorBlitRendererFeature` to the Universal Renderer asset. + + ![Add Renderer Feature](../Images/how-to/blit-xr/add-renderer-feature.png) + + For information on how to add a Renderer Feature, see the page [How to add a Renderer Feature to a Renderer](../urp-renderer-feature-how-to-add.md). + + For this example, set the Intensity property to 1.5. + +5. To visualize the example, configure the project to use XR SDK. [Add the MockHMD XR Plugin to the project](https://docs.unity3d.com/Packages/com.unity.xr.mock-hmd@latest/index.html). Set the **Render Mode** property to **Single Pass Instanced**. + + ![Configure MockHMD](../Images/how-to/blit-xr/xr-plugin-mockhmd.png) + + Unity shows the following views: + + ![Final Scene and Game views](../Images/how-to/blit-xr/final-scene-and-game-view.png) + +6. Enter the Play mode. Unity shows the color buffer. + + ![Final Play mode view](../Images/how-to/blit-xr/final-play-mode-view.png) + +The example is complete.