chore: update unity project version to unity2022.3.6f1 (#5529)

* Updated whole project from Unity 2021.3.22f1 LTS to Unity 2022.3.6f1 LTS * Updated UberPost shader based on URP 14.0.8. Re-applying our alpha value fix * Updated CharacterPreview prefab camera background color from white to black to improve avatars blending with the passport screen background * As per 2022.3.6f1 the annoying "FMOD errors" in the WebGL build should've gone away * Updated CI images used
decentraland · Aug 29, 2023 · e0095ef · e0095ef
1 parent 97da641
commit e0095ef
Show file tree

Hide file tree

Showing 86 changed files with 723 additions and 252 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,7 +12,7 @@ references:
       at: *working_directory
 
   .unity_linux_image: &unity_linux_image
-    - image: unityci/editor:ubuntu-2021.3.22f1-linux-il2cpp-1.0.1
+    - image: unityci/editor:ubuntu-2022.3.6f1-linux-il2cpp-2.0.0
       environment:
         DCL_OUTPUT_NAME: linux
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -23,7 +23,7 @@ references:
         #                                                ~~~~~~~~~~~~~~~~~~~~ <- folder name
 
   .unity_mac_image: &unity_mac_image
-    - image: unityci/editor:ubuntu-2021.3.22f1-mac-mono-1.0.1
+    - image: unityci/editor:ubuntu-2022.3.6f1-mac-mono-2.0.0
       environment:
         DCL_OUTPUT_NAME: mac
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -34,7 +34,7 @@ references:
         #                                                ~~~~~~~~~~~~~~~~~~ <- folder name
 
   .unity_windows_image: &unity_windows_image
-    - image: unityci/editor:ubuntu-2021.3.22f1-windows-mono-1.0.1
+    - image: unityci/editor:ubuntu-2022.3.6f1-windows-mono-2.0.0
       environment:
         DCL_OUTPUT_NAME: windows
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -45,7 +45,7 @@ references:
         #                                                ~~~~~~~~~~~~~~~~~~~~~~ <- folder name
 
   .unity_webgl_image: &unity_webgl_image
-    - image: unityci/editor:2021.3.22f1-webgl-1
+    - image: unityci/editor:2022.3.6f1-webgl-2.0.0
       environment:
         DCL_OUTPUT_NAME: webgl
         PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer
@@ -116,13 +116,13 @@ commands:
             echo $DCL_OUTPUT_NAME > /tmp/target
       - restore_cache:
           keys:
-            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}
-            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-dev
+            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.6f1
+            - build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-dev-2022.3.6f1
       - restore_cache: &RESTORE_LIBRARY_CACHE
           name: Restore library if exists
           keys:
-            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}
-            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-dev
+            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.6f1
+            - library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-dev-2022.3.6f1
       - run:
           name: Build Unity Project
           no_output_timeout: 45m
@@ -141,11 +141,11 @@ commands:
 
       - save_cache:
           name: Store build cache
-          key: build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}
+          key: build-{{ checksum "/tmp/target" }}-{{ checksum "../.unitysources-checksum" }}-{{ .Branch }}-2022.3.6f1
           paths: *CACHED_PATHS
       - save_cache:
           name: Store library
-          key: library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}
+          key: library-{{ checksum "/tmp/target" }}-{{ .Environment.LIBRARY_CACHE_VERSION }}-{{ .Branch }}-2022.3.6f1
           paths:
             - ./unity-renderer/Library
       - run:

diff --git a/README.md b/README.md
@@ -14,14 +14,14 @@ This repository contains the reference implementation of the [decentraland explo
     git lfs install
     git lfs pull
 
-* The [Unity](https://unity.com) engine and IDE, currently using version 2021.3.14f1
+* The [Unity](https://unity.com) engine and IDE, currently using version 2022.3.6f1
 * [node.js](https://nodejs.com), version 16 or later
 
 ### Steps
 
 Check: [Multiplatform in Editor](docs/multiplatform-in-editor.md)
 
-1. Download and install Unity 2021.3.14f1
+1. Download and install Unity 2022.3.6f1
 2. Open the scene named `InitialScene`
 3. Within the scene, select the `DebugConfig` GameObject.
 4. On `DebugConfig` inspector, make sure that `Base url mode` is set to `Custom`

diff --git a/browser-interface/static/unity.loader.js b/browser-interface/static/unity.loader.js
diff --git a/unity-renderer/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin b/unity-renderer/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin
diff --git a/...derer/Assets/DCLPlugins/ECS7/Systems/UiPointerEvents/Tests/UiPointerEventsSystemShould.cs b/...derer/Assets/DCLPlugins/ECS7/Systems/UiPointerEvents/Tests/UiPointerEventsSystemShould.cs
@@ -272,6 +272,7 @@ void UpdateSystem()
             {
                 components = { 1 }
             };
+            uiDocumentInstance.rootVisualElement.Add(internalUiComponent.rootElement);
 
             internalComponents.uiContainerComponent.PutFor(scene, entity, internalUiComponent);
 

diff --git a/unity-renderer/Assets/Materials/GizmosMaterialInWorld.mat b/unity-renderer/Assets/Materials/GizmosMaterialInWorld.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: GizmosMaterialInWorld
   m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -31,6 +33,7 @@ Material:
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -93,6 +96,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _BaseMapUVs: 0
     - _Blend: 0
     - _BlendOp: 0
@@ -102,6 +106,7 @@ Material:
     - _CullYPlane: 0.5
     - _Cutoff: 0.5
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EmissiveMapUVs: 0
     - _EnvironmentReflections: 1
     - _FadeDirection: 0
@@ -124,6 +129,7 @@ Material:
     - _SpecSource: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Stencil: 0
     - _StencilComp: 8
     - _StencilOp: 0

diff --git a/unity-renderer/Assets/Materials/ParcelMinimapIcon.mat b/unity-renderer/Assets/Materials/ParcelMinimapIcon.mat
@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ParcelMinimapIcon
   m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -18,6 +20,7 @@ Material:
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -52,12 +55,14 @@ Material:
     m_Ints: []
     m_Floats:
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1
     - _Cull: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 0
     - _Glossiness: 0
@@ -71,6 +76,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
@@ -92,4 +98,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
diff --git a/unity-renderer/Assets/Materials/TileGround.mat b/unity-renderer/Assets/Materials/TileGround.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: TileGround
   m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -31,6 +33,7 @@ Material:
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -93,12 +96,15 @@ Material:
     m_Ints: []
     m_Floats:
     - _AlphaClip: 0
+    - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
     - _Cull: 2
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _DstBlendAlpha: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossinessSource: 0
@@ -116,6 +122,7 @@ Material:
     - _SpecSource: 1
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
     - _Surface: 0
     - _UVSec: 0
     - _ZWrite: 1

diff --git a/unity-renderer/Assets/Rendering/Common/ForwardRenderer.asset b/unity-renderer/Assets/Rendering/Common/ForwardRenderer.asset
@@ -13,16 +13,28 @@ MonoBehaviour:
   m_Name: NewScreenSpaceAmbientOcclusion
   m_EditorClassIdentifier: 
   m_Active: 1
-  m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
   m_Settings:
+    AOMethod: 1
     Downsample: 0
     AfterOpaque: 0
     Source: 1
     NormalSamples: 2
     Intensity: 1.2
     DirectLightingStrength: 0.6
     Radius: 0.2
-    SampleCount: 4
+    Samples: 2
+    BlurQuality: 0
+    Falloff: 100
+    SampleCount: -1
+  m_BlueNoise256Textures:
+  - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
+  - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
+  - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
+  - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
+  - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
+  - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
+  - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
+  m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
 --- !u!114 &-5304858544757240251
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -80,15 +92,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Active: 0
   settings:
+    outlineThickness: 0
+    blurSize: 0
+    blurSigma: 0
     outlineColor: {r: 0, g: 1, b: 1, a: 1}
     blurColor: {r: 0, g: 1, b: 1, a: 1}
     innerColor: {r: 0, g: 0.85890675, b: 1, a: 0.050980393}
     effectFade: 1
-    outlineThickness: {fileID: 11400000, guid: 3b2a0097ac4974c4dbd22fdfcbd5cfeb, type: 2}
-    outlineResolutionScale: {fileID: 11400000, guid: 051dce077ac0fe84ebdd212db125cae5,
-      type: 2}
-    blurSize: {fileID: 11400000, guid: 71984a406e9d00c4eb55991db791d8d2, type: 2}
-    blurSigma: {fileID: 11400000, guid: 15aeca967a14da64882661d82afedba4, type: 2}
     filterMode: 1
 --- !u!114 &-981180908113067146
 MonoBehaviour:
@@ -127,6 +137,7 @@ MonoBehaviour:
   debugShaders:
     debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
       type: 3}
+    hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
   m_RendererFeatures:
   - {fileID: -7551554940414059620}
   - {fileID: 4650022159256899313}
@@ -144,14 +155,18 @@ MonoBehaviour:
     samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
     stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
     fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
     materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
     coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
     coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
       type: 3}
+    blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
     cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
       type: 3}
     objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
       type: 3}
+    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+      type: 3}
   m_AssetVersion: 2
   m_OpaqueLayerMask:
     serializedVersion: 2
@@ -171,8 +186,6 @@ MonoBehaviour:
   m_DepthPrimingMode: 0
   m_CopyDepthMode: 0
   m_AccurateGbufferNormals: 0
-  m_ClusteredRendering: 0
-  m_TileSize: 32
   m_IntermediateTextureMode: 1
 --- !u!114 &1990522510072472895
 MonoBehaviour:
-Original file line number
+Diff line change
@@ Expand Up / @@ -272,6 +272,7 @@ void UpdateSystem() @@
                 {
                     components = { 1 }
                 };
+                uiDocumentInstance.rootVisualElement.Add(internalUiComponent.rootElement);
                 internalComponents.uiContainerComponent.PutFor(scene, entity, internalUiComponent);
@@ Expand Down @@