From e0095ef473420f01b840a753b950d6eea679d5d4 Mon Sep 17 00:00:00 2001 From: Pravus Date: Tue, 29 Aug 2023 12:22:42 +0200 Subject: [PATCH] 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 --- .circleci/config.yml | 20 ++-- README.md | 4 +- browser-interface/static/unity.loader.js | 2 +- .../WebGL/addressables_content_state.bin | 4 +- .../Tests/UiPointerEventsSystemShould.cs | 1 + .../Materials/GizmosMaterialInWorld.mat | 8 +- .../Assets/Materials/ParcelMinimapIcon.mat | 8 +- .../Assets/Materials/TileGround.mat | 9 +- .../Rendering/Common/ForwardRenderer.asset | 31 +++-- .../Common/UniversalRenderPipelineAsset.asset | 43 ++++++- .../InfiniteFloor/SG_InfiniteFloor_1_7F.mat | 5 +- .../M_SG_InfToSkyBlenderv2.mat | 5 +- .../M_SG_RoundEdgesInterpolator.mat | 6 +- .../M_SG_TestInfiniteFloor.mat | 28 ++++- .../CrossSection/M_AvatarRevealParticle.mat | 8 +- .../CrossSection/M_FinalGhost.mat | 5 +- .../Outliner/OutlineScreenEffectFeature.cs | 12 +- .../ShaderProceduralSkybox/M_Skybox02.mat | 13 ++- .../M_Skybox02Cubemap 1.mat | 14 ++- .../M_Skybox02_Original_Settings.mat | 16 ++- .../Meshes/CloudS/CloudShader.mat | 5 +- .../Meshes/CloudS/M_MeshClouds.mat | 5 +- .../Meshes/Dome/M_AudioBand.mat | 7 +- .../Meshes/Dome/M_DomeCubemap.mat | 9 +- .../Meshes/Dome/M_DomeParticles.mat | 11 +- .../Meshes/Dome/M_DomePlannar.mat | 7 +- .../Meshes/Dome/M_DomeSatellite.mat | 9 +- .../Meshes/Dome/M_DomeSkybox 1.mat | 9 +- .../Meshes/Dome/M_DomeSkybox 2.mat | 11 +- .../Meshes/Dome/M_DomeSkybox.mat | 9 +- .../Meshes/New Material 1.mat | 8 +- .../Meshes/ShootingStar/M_Sparkles.mat | 8 +- .../Meshes/ShootingStar/M_StarTrail.mat | 5 +- .../ToolProceduralSkybox/M_3DSatellite.mat | 5 +- .../Prefabs/Satellite.mat | 6 +- .../Rendering/Shaders/URP/UberPost.shader | 89 +++++++++++--- .../Rendering/UI/Blur/GaussianBlurHandler.cs | 16 +-- .../Rendering/UI/Blur/M_GaussianBlur.mat | 110 ++++++++++-------- .../Resources/Materials/AssetLoading.mat | 9 +- .../Assets/Resources/Materials/Default.mat | 9 +- .../Resources/Materials/DefaultPlane.mat | 9 +- .../Scripts/Editor/PreBuildProcessing.cs | 6 +- .../Avatar/Materials/Light Material.mat | 9 +- .../Particle Expression Clap Material.mat | 8 +- .../Particle Expression Confetti Material.mat | 8 +- .../Particle Expression Cry Material.mat | 8 +- .../Particle Expression Heart Material.mat | 8 +- .../Particle Expression Ho Material.mat | 8 +- .../Particle Expression Money Material.mat | 8 +- ...Particle Expression Snowflake Material.mat | 8 +- .../AssetManager/AssetBundles/AB.meta | 2 +- .../AssetBundles/{ => AB}/AB_GameObject.meta | 2 +- .../AssetLibrary_AB_GameObject.cs | 0 .../AssetLibrary_AB_GameObject.cs.meta | 0 .../AssetPromiseKeeper_AB_GameObject.cs | 0 .../AssetPromiseKeeper_AB_GameObject.cs.meta | 0 .../AssetPromise_AB_GameObject.cs | 0 .../AssetPromise_AB_GameObject.cs.meta | 0 .../AB_GameObject/Asset_AB_GameObject.cs | 0 .../AB_GameObject/Asset_AB_GameObject.cs.meta | 0 .../{ => AB}/AB_GameObject/Tests.meta | 0 .../Tests/APK_AB_GameObject_Promise_Should.cs | 0 .../APK_AB_GameObject_Promise_Should.cs.meta | 0 .../Tests/APK_AB_GameObject_ShouldWorkWhen.cs | 0 .../APK_AB_GameObject_ShouldWorkWhen.cs.meta | 0 .../Tests/APK_AB_GameObject_Tests.asmdef | 0 .../Tests/APK_AB_GameObject_Tests.asmdef.meta | 0 .../Tests/BlockedAndMasterPromisesShould.cs | 0 .../BlockedAndMasterPromisesShould.cs.meta | 0 .../AB/Providers/AssetBundleWebLoader.cs | 2 +- .../AssetBundleDepMapLoadHelper.cs.meta | 2 +- .../AssetManager/AssetBundles/SceneAB.meta | 11 +- .../AssetManager/AssetBundles/TestScene.meta | 2 +- .../Resources/CharacterPreview.prefab | 77 ++++++++---- .../Helpers/TextureHelpers/TextureHelpers.cs | 2 +- ...niversalRenderPipelineGlobalSettings.asset | 16 ++- unity-renderer/Packages/manifest.json | 19 +-- unity-renderer/Packages/packages-lock.json | 88 +++++++++----- .../Settings.json | 2 - .../ProjectSettings/ProjectSettings.asset | 63 ++++++---- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/URPProjectSettings.asset | 2 +- unity-renderer/ProjectSettings/boot.config | 0 ...Tests_AlbedoTexture_AlbedoAlpha_0_25_0.png | 4 +- ...Tests_AlbedoTexture_AlbedoAlpha_0_75_0.png | 4 +- ...ualTests_AlbedoTexture_AlbedoAlpha_1_0.png | 4 +- 86 files changed, 723 insertions(+), 252 deletions(-) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject.meta (77%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/AssetLibrary_AB_GameObject.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/AssetLibrary_AB_GameObject.cs.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/AssetPromise_AB_GameObject.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/AssetPromise_AB_GameObject.cs.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Asset_AB_GameObject.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Asset_AB_GameObject.cs.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef.meta (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs (100%) rename unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/{ => AB}/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs.meta (100%) delete mode 100644 unity-renderer/ProjectSettings/boot.config diff --git a/.circleci/config.yml b/.circleci/config.yml index 21af897deb..7a9b7abf5d 100644 --- 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 index b913698699..b58682d93f 100644 --- 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 index 118321ebaa..8e80bd88a9 100644 --- a/browser-interface/static/unity.loader.js +++ b/browser-interface/static/unity.loader.js @@ -1 +1 @@ -function createUnityInstance(r,n,l){function s(e,r){if(!s.aborted&&n.showBanner)return"error"==r&&(s.aborted=!0),n.showBanner(e,r);switch(r){case"error":console.error(e);break;case"warning":console.warn(e);break;default:console.log(e)}}function t(e){var r=e.reason||e.error,n=r?r.toString():e.message||e.reason||"",t=r&&r.stack?r.stack.toString():"";(n+="\n"+(t=t.startsWith(n)?t.substring(n.length):t).trim())&&c.stackTraceRegExp&&c.stackTraceRegExp.test(n)&&p(n,e.filename||r&&(r.fileName||r.sourceURL)||"",e.lineno||r&&(r.lineNumber||r.line)||0)}function e(e,r,n){var t=e[r];void 0!==t&&t||(console.warn('Config option "'+r+'" is missing or empty. Falling back to default value: "'+n+'". Consider updating your WebGL template to include the missing config option.'),e[r]=n)}l=l||function(){};var o,c={canvas:r,webglContextAttributes:{preserveDrawingBuffer:!1,powerPreference:2},streamingAssetsUrl:"StreamingAssets",downloadProgress:{},deinitializers:[],intervals:{},setInterval:function(e,r){e=window.setInterval(e,r);return this.intervals[e]=!0,e},clearInterval:function(e){delete this.intervals[e],window.clearInterval(e)},preRun:[],postRun:[],print:function(e){console.log(e)},printErr:function(e){console.error(e),"string"==typeof e&&-1!=e.indexOf("wasm streaming compile failed")&&(-1!=e.toLowerCase().indexOf("mime")?s('HTTP Response Header "Content-Type" configured incorrectly on the server for file '+c.codeUrl+' , should be "application/wasm". Startup time performance will suffer.',"warning"):s('WebAssembly streaming compilation failed! This can happen for example if "Content-Encoding" HTTP header is incorrectly enabled on the server for file '+c.codeUrl+", but the file is not pre-compressed on disk (or vice versa). Check the Network tab in browser Devtools to debug server header configuration.","warning"))},locateFile:function(e){return"build.wasm"==e?this.codeUrl:e},disabledCanvasEvents:["contextmenu","dragstart"]};for(o in e(n,"companyName","Unity"),e(n,"productName","WebGL Player"),e(n,"productVersion","1.0"),n)c[o]=n[o];c.streamingAssetsUrl=new URL(c.streamingAssetsUrl,document.URL).href;var i=c.disabledCanvasEvents.slice();function a(e){e.preventDefault()}i.forEach(function(e){r.addEventListener(e,a)}),window.addEventListener("error",t),window.addEventListener("unhandledrejection",t),c.deinitializers.push(function(){for(var e in c.disableAccessToMediaDevices(),i.forEach(function(e){r.removeEventListener(e,a)}),window.removeEventListener("error",t),window.removeEventListener("unhandledrejection",t),c.intervals)window.clearInterval(e);c.intervals={}}),c.QuitCleanup=function(){for(var e=0;eIf using custom web server, verify that web server is sending .br files with HTTP Response Header "Content-Encoding: br". Brotli compression may not be supported in Firefox over HTTP connections. '+t+' See https://bugzilla.mozilla.org/show_bug.cgi?id=1670675 for more information.':"Unable to parse "+c.frameworkUrl+'!
If using custom web server, verify that web server is sending .br files with HTTP Response Header "Content-Encoding: br". Brotli compression may not be supported over HTTP connections. Migrate your server to use HTTPS.'),void s(n,"error"))}s("Unable to parse "+c.frameworkUrl+"! The file is corrupt, or compression was misconfigured? (check Content-Encoding HTTP Response Header on web server)","error")}var o=unityFramework;unityFramework=null,a.onload=null,i(o)},a.onerror=function(e){s("Unable to load file "+c.frameworkUrl+"! Check that the file exists on the remote server. (also check browser Console and Devtools Network tab to debug)","error")},document.body.appendChild(a),c.deinitializers.push(function(){document.body.removeChild(a)})}).then(function(e){e(c)});var e=b("dataUrl");c.preRun.push(function(){c.addRunDependency("dataUrl"),e.then(function(e){var r=new DataView(e.buffer,e.byteOffset,e.byteLength),n=0,t="UnityWebData1.0\0";if(!String.fromCharCode.apply(null,e.subarray(n,n+t.length))==t)throw"unknown data format";var o=r.getUint32(n+=t.length,!0);for(n+=4;n>2],usedWASMHeapSize:c.HEAPU32[1+(e>>2)],totalJSHeapSize:c.HEAPF64[1+(e>>3)],usedJSHeapSize:c.HEAPF64[2+(e>>3)]}}};function g(e,r,n){-1==e.indexOf("fullscreen error")&&(c.startupErrorHandler?c.startupErrorHandler(e,r,n):c.errorHandler&&c.errorHandler(e,r,n)||(console.log("Invoking error handler due to\n"+e),"function"==typeof dump&&dump("Invoking error handler due to\n"+e),g.didShowErrorMessage||(-1!=(e="An error occurred running the Unity content on this page. See your browser JavaScript console for more info. The error was:\n"+e).indexOf("DISABLE_EXCEPTION_CATCHING")?e="An exception has occurred, but exception handling has been disabled in this build. If you are the developer of this content, enable exceptions in your project WebGL player settings to be able to catch the exception or see the stack trace.":-1!=e.indexOf("Cannot enlarge memory arrays")?e="Out of memory. If you are the developer of this content, try allocating more memory to your WebGL build in the WebGL player settings.":-1==e.indexOf("Invalid array buffer length")&&-1==e.indexOf("Invalid typed array length")&&-1==e.indexOf("out of memory")&&-1==e.indexOf("could not allocate memory")||(e="The browser could not allocate enough memory for the WebGL content. If you are the developer of this content, try allocating less memory to your WebGL build in the WebGL player settings."),alert(e),g.didShowErrorMessage=!0)))}function p(e,r){var n="(wasm-function\\[)(\\d+)(\\])",t=new RegExp(n);return e.replace(new RegExp(n,"g"),function(e){e=e.match(t);return e[1]+(r[e[2]]?r[e[2]]+"@":"")+e[2]+e[3]})}function m(t,o,a){c.symbols?g(p(t,c.symbols),o,a):c.symbolsUrl?v("symbolsUrl").then(function(e){for(var r="",n=0;nIf using custom web server, verify that web server is sending .br files with HTTP Response Header "Content-Encoding: br". Brotli compression may not be supported in Firefox over HTTP connections. '+t+' See https://bugzilla.mozilla.org/show_bug.cgi?id=1670675 for more information.':"Unable to parse "+c.frameworkUrl+'!
If using custom web server, verify that web server is sending .br files with HTTP Response Header "Content-Encoding: br". Brotli compression may not be supported over HTTP connections. Migrate your server to use HTTPS.'),void s(n,"error"))}s("Unable to parse "+c.frameworkUrl+"! The file is corrupt, or compression was misconfigured? (check Content-Encoding HTTP Response Header on web server)","error")}var o=unityFramework;unityFramework=null,i.onload=null,a(o)},i.onerror=function(e){s("Unable to load file "+c.frameworkUrl+"! Check that the file exists on the remote server. (also check browser Console and Devtools Network tab to debug)","error")},document.body.appendChild(i),c.deinitializers.push(function(){document.body.removeChild(i)})}).then(function(e){e(c)});var e=v("dataUrl");c.preRun.push(function(){c.addRunDependency("dataUrl"),e.then(function(e){var r=new DataView(e.buffer,e.byteOffset,e.byteLength),n=0,t="UnityWebData1.0\0";if(!String.fromCharCode.apply(null,e.subarray(n,n+t.length))==t)throw"unknown data format";var o=r.getUint32(n+=t.length,!0);for(n+=4;n 0) { + #ifdef USING_STEREO_MATRICES + // With XR, the views can use asymmetric FOV which will have the center of each + // view be at a different location. + const float2 VignetteCenter = unity_StereoEyeIndex == 0 ? VignetteCenterEye0 : VignetteCenterEye1; + #endif + color = ApplyVignette(color, uvDistorted, VignetteCenter, VignetteIntensity, VignetteRoundness, VignetteSmoothness, VignetteColor); } @@ -201,7 +241,7 @@ Shader "DCL/Universal Render Pipeline/UberPost" #if _FILM_GRAIN { - color = ApplyGrain(color, uv, TEXTURE2D_ARGS(_Grain_Texture, sampler_LinearRepeat), GrainIntensity, GrainResponse, GrainScale, GrainOffset); + color = ApplyGrain(color, uv, TEXTURE2D_ARGS(_Grain_Texture, sampler_LinearRepeat), GrainIntensity, GrainResponse, GrainScale, GrainOffset, OneOverPaperWhite); } #endif @@ -219,13 +259,21 @@ Shader "DCL/Universal Render Pipeline/UberPost" #if _DITHERING { - color = ApplyDithering(color, uv, TEXTURE2D_ARGS(_BlueNoise_Texture, sampler_PointRepeat), DitheringScale, DitheringOffset); + color = ApplyDithering(color, uv, TEXTURE2D_ARGS(_BlueNoise_Texture, sampler_PointRepeat), DitheringScale, DitheringOffset, PaperWhite, OneOverPaperWhite); // Assume color > 0 and prevent 0 - ditherNoise. // Negative colors can cause problems if fed back to the postprocess via render to FP16 texture. color = max(color, 0); } #endif + #ifdef HDR_ENCODING + { + float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, input.texcoord); + color.rgb = SceneUIComposition(uiSample, color.rgb, PaperWhite, MaxNits); + color.rgb = OETF(color.rgb); + } + #endif + #if defined(DEBUG_DISPLAY) half4 debugColor = 0; @@ -235,7 +283,7 @@ Shader "DCL/Universal Render Pipeline/UberPost" } #endif - half alpha = SAMPLE_TEXTURE2D_X(_SourceTex, sampler_LinearClamp, uvDistorted).w; + half alpha = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uvDistorted).w; return half4(color, alpha); } @@ -243,7 +291,10 @@ Shader "DCL/Universal Render Pipeline/UberPost" SubShader { - Tags { "RenderType" = "Opaque" "RenderPipeline" = "UniversalPipeline"} + Tags + { + "RenderType" = "Opaque" "RenderPipeline" = "UniversalPipeline" + } LOD 100 ZTest Always ZWrite Off Cull Off @@ -252,9 +303,11 @@ Shader "DCL/Universal Render Pipeline/UberPost" Name "UberPost" HLSLPROGRAM - #pragma vertex FullscreenVert - #pragma fragment Frag + #pragma vertex Vert + #pragma fragment FragUberPost ENDHLSL } } -} + + +} \ No newline at end of file diff --git a/unity-renderer/Assets/Rendering/UI/Blur/GaussianBlurHandler.cs b/unity-renderer/Assets/Rendering/UI/Blur/GaussianBlurHandler.cs index 51be4c95fd..ef35a45ed6 100644 --- a/unity-renderer/Assets/Rendering/UI/Blur/GaussianBlurHandler.cs +++ b/unity-renderer/Assets/Rendering/UI/Blur/GaussianBlurHandler.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; @@ -20,7 +18,7 @@ public class GaussianBlurSettings public string targetName = "_blurTexture"; } - + [SerializeField] public GaussianBlurSettings settings = new GaussianBlurSettings(); public class GaussianBlurPass : ScriptableRenderPass @@ -37,11 +35,11 @@ public class GaussianBlurPass : ScriptableRenderPass RenderTargetIdentifier tmpRT1; RenderTargetIdentifier tmpRT2; - private RenderTargetIdentifier source {get; set;} + private ScriptableRenderer renderer {get; set;} - public void Setup(RenderTargetIdentifier source) + public void Setup(ScriptableRenderer renderer) { - this.source = source; + this.renderer = renderer; } public GaussianBlurPass(string profilerTag) @@ -74,10 +72,9 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData RenderTextureDescriptor opaqueDesc = renderingData.cameraData.cameraTargetDescriptor; opaqueDesc.depthBufferBits = 0; - //first pass cmd.SetGlobalFloat("_offset", 1.5f); - cmd.Blit(source, tmpRT1, blurMat); + cmd.Blit(renderer.cameraColorTarget, tmpRT1, blurMat); for (int i = 1; i < passes - 1; i++) { @@ -118,8 +115,7 @@ public override void Create() public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { - var src = renderer.cameraColorTarget; - scriptablePass.Setup(src); + scriptablePass.Setup(renderer); renderer.EnqueuePass(scriptablePass); } } diff --git a/unity-renderer/Assets/Rendering/UI/Blur/M_GaussianBlur.mat b/unity-renderer/Assets/Rendering/UI/Blur/M_GaussianBlur.mat index adec4f579c..27da15d078 100644 --- a/unity-renderer/Assets/Rendering/UI/Blur/M_GaussianBlur.mat +++ b/unity-renderer/Assets/Rendering/UI/Blur/M_GaussianBlur.mat @@ -1,46 +1,64 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: M_GaussianBlur - m_Shader: {fileID: -6465566751694194690, guid: 98d7c5988ea6f5149b6a058a380f6c9f, - type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _mask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: [] - m_Colors: - - _Color: {r: 0.509434, g: 0, b: 0.26251706, a: 1} - m_BuildTextureStacks: [] +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-107934730172443309 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_GaussianBlur + m_Shader: {fileID: -6465566751694194690, guid: 98d7c5988ea6f5149b6a058a380f6c9f, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _mask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0.509434, g: 0, b: 0.26251706, a: 1} + m_BuildTextureStacks: [] diff --git a/unity-renderer/Assets/Resources/Materials/AssetLoading.mat b/unity-renderer/Assets/Resources/Materials/AssetLoading.mat index 23e23c58c1..3da62b4dab 100644 --- a/unity-renderer/Assets/Resources/Materials/AssetLoading.mat +++ b/unity-renderer/Assets/Resources/Materials/AssetLoading.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: AssetLoading 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: @@ -81,12 +84,15 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -99,6 +105,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/unity-renderer/Assets/Resources/Materials/Default.mat b/unity-renderer/Assets/Resources/Materials/Default.mat index 681a11ad6e..cd67ea001c 100644 --- a/unity-renderer/Assets/Resources/Materials/Default.mat +++ b/unity-renderer/Assets/Resources/Materials/Default.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: Default m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _GLOSSINESS_FROM_BASE_ALPHA - _SPECULAR_COLOR @@ -33,6 +35,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,12 +98,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 @@ -118,6 +124,7 @@ Material: - _SpecSource: 1 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/unity-renderer/Assets/Resources/Materials/DefaultPlane.mat b/unity-renderer/Assets/Resources/Materials/DefaultPlane.mat index 2db1807ee8..f26963663a 100644 --- a/unity-renderer/Assets/Resources/Materials/DefaultPlane.mat +++ b/unity-renderer/Assets/Resources/Materials/DefaultPlane.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DefaultPlane m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, 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: @@ -80,12 +83,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 @@ -103,6 +109,7 @@ Material: - _SpecSource: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -124,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/Editor/PreBuildProcessing.cs b/unity-renderer/Assets/Scripts/Editor/PreBuildProcessing.cs index 4776d0ece4..36506baa7a 100644 --- a/unity-renderer/Assets/Scripts/Editor/PreBuildProcessing.cs +++ b/unity-renderer/Assets/Scripts/Editor/PreBuildProcessing.cs @@ -6,7 +6,7 @@ // Emscripten build toolchain for WebGL builds on Unity 2020.3 depends on Python 2.7 or later. [WebGL builds on Unity 2021.2 and later require Python 3]. // Solution for building locally for WebGL on macOS: // 1. Download Python 3+ at https://www.python.org/downloads/release/python-3105/ -// 2. Have this PreBuildProcessing script in place to re-map Python path when building. +// 2. Have this PreBuildProcessing script in place to re-map Python path when building. // https://forum.unity.com/threads/case-1412113-builderror-osx-12-3-and-unity-2020-3-constant-build-errors.1255419/#post-7993017 // https://answers.unity.com/questions/1893841/unity-2020328f1-webgl-build-failed-on-macos-monter.html @@ -18,10 +18,10 @@ public void OnPreprocessBuild(BuildReport report) #if UNITY_EDITOR && UNITY_EDITOR_OSX System.Environment.SetEnvironmentVariable("EMSDK_PYTHON", "/Library/Frameworks/Python.framework/Versions/3.10/bin/python3"); #endif - + #if UNITY_WEBGL // Tip: ' --memoryprofiler ' argument can be added to log every memory enlargement in the console but it makes the app super slow - PlayerSettings.WebGL.emscriptenArgs += "-s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB "; + PlayerSettings.WebGL.emscriptenArgs += "-s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -s ERROR_ON_UNDEFINED_SYMBOLS=0 "; #endif } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Light Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Light Material.mat index 662aa8a504..29ffc6b7ac 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Light Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Light Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Light Material 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: @@ -80,7 +83,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +109,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Clap Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Clap Material.mat index e67c21fe57..280bdba54b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Clap Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Clap Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Clap Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0.1 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Confetti Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Confetti Material.mat index 9b2c7f8d42..6af92ac58e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Confetti Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Confetti Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Confetti Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0.1 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Cry Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Cry Material.mat index 905668ab45..91bff9ae9a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Cry Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Cry Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Cry Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0.1 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Heart Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Heart Material.mat index 4faac2fa53..3eb8380d25 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Heart Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Heart Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Heart Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Ho Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Ho Material.mat index d97d3b0921..a5364c0c34 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Ho Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Ho Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Ho Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0.1 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Money Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Money Material.mat index 376b7d7824..646514d7e3 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Money Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Money Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Money Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0.1 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Snowflake Material.mat b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Snowflake Material.mat index f82d6914d3..d9ae7af720 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Snowflake Material.mat +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Materials/Particle Expression/Particle Expression Snowflake Material.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Particle Expression Snowflake Material m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +164,7 @@ Material: m_Floats: - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -179,6 +183,7 @@ Material: - _DistortionStrengthScaled: 0.1 - _DitherFade: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FadeDirection: -0.04 @@ -204,6 +209,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -246,4 +252,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB.meta index 52ece0a789..22d9f35079 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB.meta +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec9604701ca68dd40819f572d76999f5 +guid: 1d630fab791c14ec68cf1da7c5ede073 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject.meta similarity index 77% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject.meta index c7c957447e..07cea0f11c 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject.meta +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eba843bea5b9b214cb7303696e950e9d +guid: 087033f09c1a94c209afc385e1c9d9c0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetLibrary_AB_GameObject.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetLibrary_AB_GameObject.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetLibrary_AB_GameObject.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetLibrary_AB_GameObject.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetLibrary_AB_GameObject.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetLibrary_AB_GameObject.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetLibrary_AB_GameObject.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetLibrary_AB_GameObject.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromiseKeeper_AB_GameObject.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromise_AB_GameObject.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromise_AB_GameObject.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromise_AB_GameObject.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromise_AB_GameObject.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromise_AB_GameObject.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromise_AB_GameObject.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/AssetPromise_AB_GameObject.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/AssetPromise_AB_GameObject.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Asset_AB_GameObject.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Asset_AB_GameObject.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Asset_AB_GameObject.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Asset_AB_GameObject.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Asset_AB_GameObject.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Asset_AB_GameObject.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Asset_AB_GameObject.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Asset_AB_GameObject.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Promise_Should.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_ShouldWorkWhen.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/APK_AB_GameObject_Tests.asmdef.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs.meta similarity index 100% rename from unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs.meta rename to unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/AB_GameObject/Tests/BlockedAndMasterPromisesShould.cs.meta diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/Providers/AssetBundleWebLoader.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/Providers/AssetBundleWebLoader.cs index 27d1ecc7d2..a279acc04f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/Providers/AssetBundleWebLoader.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AB/Providers/AssetBundleWebLoader.cs @@ -36,7 +36,7 @@ public async UniTask GetAssetBundleAsync(string contentUrl, string var hash128 = ComputeHash(contentUrl, hash); if (cachingEnabled) - AssetResolverLogger.LogVerbose(featureFlags, LogType.Log, $"Asset Bundle {hash} is cached: {Caching.IsVersionCached(url, hash128)}"); + AssetResolverLogger.LogVerbose(featureFlags, LogType.Log, $"Asset Bundle {hash} is cached..."); using var webRequest = cachingEnabled ? webRequestController.Ref.GetAssetBundle(url, hash: hash128, disposeOnCompleted: false) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AssetBundleDepMapLoadHelper.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AssetBundleDepMapLoadHelper.cs.meta index 8b06813646..cc65c81020 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AssetBundleDepMapLoadHelper.cs.meta +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/AssetBundleDepMapLoadHelper.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3424a5e07e1ed00499e915df1474e842 +guid: a95327c353a6b497e9584428757a7226 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/SceneAB.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/SceneAB.meta index f46fa207e6..1ad3db42b1 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/SceneAB.meta +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/SceneAB.meta @@ -1,3 +1,8 @@ -fileFormatVersion: 2 -guid: cf9e293f2e3a4cf49fddb3268e2915ae -timeCreated: 1675701853 \ No newline at end of file +fileFormatVersion: 2 +guid: b4720f2f570a243baba71f1ff3b70447 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/TestScene.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/TestScene.meta index 18c166c964..32f8873d97 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/TestScene.meta +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/AssetManager/AssetBundles/TestScene.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1cbbc1c5f86077e4d84f5b5f2959af6f +guid: 153e1723390d14975b55e0b3476a2638 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/CharacterPreview/Resources/CharacterPreview.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/CharacterPreview/Resources/CharacterPreview.prefab index b6f8dac4cc..8cf1218a3b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/CharacterPreview/Resources/CharacterPreview.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/CharacterPreview/Resources/CharacterPreview.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 675479187964996029} + serializedVersion: 2 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} @@ -35,7 +36,6 @@ Transform: - {fileID: 2101915663460868012} - {fileID: 8359086198727238802} m_Father: {fileID: 856552461296544030} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &924567112239674158 GameObject: @@ -60,13 +60,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 924567112239674158} + serializedVersion: 2 m_LocalRotation: {x: -0.000000015357923, y: 0.99663097, z: -0.08201674, w: -0.00000018662264} m_LocalPosition: {x: 0, y: 1.2, z: 1.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315422120597451079} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!1 &2165317392677908272 GameObject: @@ -91,13 +91,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2165317392677908272} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.755, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6705057966129581724} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2336898274352981239 GameObject: @@ -122,13 +122,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2336898274352981239} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.996631, z: -0.08201647, w: 0} m_LocalPosition: {x: 0, y: 1.4, z: 3.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315422120597451079} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!1 &2373073172079434442 GameObject: @@ -153,13 +153,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2373073172079434442} + serializedVersion: 2 m_LocalRotation: {x: -0.000000015357923, y: 0.99663097, z: -0.08201674, w: -0.00000018662264} m_LocalPosition: {x: 0, y: 0.55, z: 1.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315422120597451079} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!1 &2616646339232869385 GameObject: @@ -184,6 +184,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2616646339232869385} + serializedVersion: 2 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} @@ -192,7 +193,6 @@ Transform: - {fileID: 7143330429815360873} - {fileID: 4122678849617202556} m_Father: {fileID: 6705057966129581724} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3280045265141968511 GameObject: @@ -217,13 +217,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3280045265141968511} + serializedVersion: 2 m_LocalRotation: {x: -0.000000008167887, y: 0.9990483, z: -0.043619405, w: -0.0000001870753} m_LocalPosition: {x: -0.04, y: 2.08, z: 3.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4189784172409983158} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 5, y: 180.00002, z: 0} --- !u!1 &3355893819437101396 GameObject: @@ -250,13 +250,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3355893819437101396} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.3, z: 0} m_LocalScale: {x: -10, y: 0.1, z: -10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 699008548463003348} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5745255516616087807 MeshFilter: @@ -274,9 +274,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3355893819437101396} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3569267310167974304 @@ -303,6 +311,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3569267310167974304} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.568627, y: 1.568627, z: 1.568627} @@ -313,7 +322,6 @@ Transform: - {fileID: 6765015854197648131} - {fileID: 6705057966129581724} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4064226640794097003 MonoBehaviour: @@ -360,13 +368,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4359887352888629573} + serializedVersion: 2 m_LocalRotation: {x: -0.000000015357923, y: 0.99663097, z: -0.08201674, w: -0.00000018662264} m_LocalPosition: {x: 0, y: 0.1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315422120597451079} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!1 &4765151791641290875 GameObject: @@ -394,13 +402,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4765151791641290875} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.13052616, z: 0, w: 0.9914449} m_LocalPosition: {x: -0.02, y: 0.75, z: 0.05} m_LocalScale: {x: 0.07, y: 1, z: 0.07} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6705057966129581724} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0} --- !u!33 &4258289027880392679 MeshFilter: @@ -460,9 +468,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4765151791641290875} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -489,13 +505,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5657874010593393711} + serializedVersion: 2 m_LocalRotation: {x: -0.000000015357923, y: 0.99663097, z: -0.08201674, w: -0.00000018662264} m_LocalPosition: {x: 0, y: 1.6, z: 1.6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315422120597451079} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!1 &6856622359626919856 GameObject: @@ -521,6 +537,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6856622359626919856} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -530,7 +547,6 @@ Transform: - {fileID: 4189784172409983158} - {fileID: 6330938306941996623} m_Father: {fileID: 699008548463003348} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2150367651614698250 MonoBehaviour: @@ -591,13 +607,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7980198007780976873} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.996631, z: -0.08201647, w: 0} m_LocalPosition: {x: 0.000073242205, y: 1.48, z: 3.78} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4315422120597451079} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!1 &8127486274469708600 GameObject: @@ -622,13 +638,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8127486274469708600} + serializedVersion: 2 m_LocalRotation: {x: -0.018053666, y: -0.9987845, z: -0.04336066, w: 0.014952045} m_LocalPosition: {x: 0.025, y: 2.41, z: 0.72299993} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4189784172409983158} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -5, y: -178.37201, z: 2} --- !u!1 &8241678440887229371 GameObject: @@ -655,13 +671,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8241678440887229371} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.996631, z: -0.08201647, w: 0} m_LocalPosition: {x: 0, y: 1.4, z: 3.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 699008548463003348} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 9.409, y: 180.00002, z: 0} --- !u!20 &3830021777958501345 Camera: @@ -673,13 +689,21 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -736,9 +760,20 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 0 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 --- !u!1 &8716808962879380553 GameObject: m_ObjectHideFlags: 0 @@ -762,6 +797,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716808962879380553} + serializedVersion: 2 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} @@ -769,5 +805,4 @@ Transform: m_Children: - {fileID: 4315422120597451079} m_Father: {fileID: 699008548463003348} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Helpers/TextureHelpers/TextureHelpers.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Helpers/TextureHelpers/TextureHelpers.cs index 275f5020ec..b73fd9d22b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Helpers/TextureHelpers/TextureHelpers.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Helpers/TextureHelpers/TextureHelpers.cs @@ -74,7 +74,7 @@ public static Texture2D CopyTexture(Texture2D sourceTexture) Texture2D texture = new Texture2D(sourceTexture.width, sourceTexture.height, sourceTexture.format, false); // Note: Surprisingly this works in WebGL here but it doesn't work in Resize() - Graphics.CopyTexture(sourceTexture, texture); + Graphics.CopyTexture(sourceTexture, 0, 0, texture, 0, 0); return texture; } diff --git a/unity-renderer/Assets/UniversalRenderPipelineGlobalSettings.asset b/unity-renderer/Assets/UniversalRenderPipelineGlobalSettings.asset index a996a2e6ea..98f0dfda6c 100644 --- a/unity-renderer/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/unity-renderer/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/unity-renderer/Packages/manifest.json b/unity-renderer/Packages/manifest.json index 5c5b73ae79..ed5172abfc 100644 --- a/unity-renderer/Packages/manifest.json +++ b/unity-renderer/Packages/manifest.json @@ -12,24 +12,25 @@ "com.madsbangh.easybuttons": "1.3.0", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.addressables": "1.19.19", + "com.unity.addressables": "1.21.12", + "com.unity.ai.navigation": "1.1.4", "com.unity.build-report-inspector": "https://github.com/needle-mirror/com.unity.build-report-inspector.git", - "com.unity.cinemachine": "2.8.9", + "com.unity.cinemachine": "2.9.5", "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.memoryprofiler": "0.7.1-preview.1", + "com.unity.memoryprofiler": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.postprocessing": "3.2.2", "com.unity.profiling.core": "1.0.2", - "com.unity.render-pipelines.universal": "12.1.10", - "com.unity.scriptablebuildpipeline": "1.20.1", - "com.unity.shadergraph": "12.1.10", + "com.unity.render-pipelines.universal": "14.0.8", + "com.unity.scriptablebuildpipeline": "1.21.5", + "com.unity.shadergraph": "14.0.8", "com.unity.test-framework": "2.0.1-pre.18", "com.unity.test-framework.performance": "2.8.1-preview", - "com.unity.testtools.codecoverage": "1.2.2", + "com.unity.testtools.codecoverage": "1.2.4", "com.unity.textmeshpro": "3.2.0-pre.3", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.10", "com.vrmc.gltf": "https://github.com/decentraland/UniVRM.git?path=/Assets/UniGLTF#master", diff --git a/unity-renderer/Packages/packages-lock.json b/unity-renderer/Packages/packages-lock.json index 268a7c003d..405b13a0b7 100644 --- a/unity-renderer/Packages/packages-lock.json +++ b/unity-renderer/Packages/packages-lock.json @@ -87,14 +87,17 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } }, "com.unity.addressables": { - "version": "1.19.19", + "version": "1.21.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.19.6", + "com.unity.scriptablebuildpipeline": "1.21.5", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -103,6 +106,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.navigation": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.build-report-inspector": { "version": "https://github.com/needle-mirror/com.unity.build-report-inspector.git", "depth": 0, @@ -111,7 +123,7 @@ "hash": "b538913dd9e0656b1363db3ffc12a723563242d9" }, "com.unity.burst": { - "version": "1.8.2", + "version": "1.8.7", "depth": 1, "source": "registry", "dependencies": { @@ -120,7 +132,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.8.9", + "version": "2.9.5", "depth": 0, "source": "registry", "dependencies": { @@ -152,7 +164,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -175,7 +187,7 @@ "url": "https://packages.unity.com" }, "com.unity.memoryprofiler": { - "version": "0.7.1-preview.1", + "version": "1.0.0", "depth": 0, "source": "registry", "dependencies": { @@ -207,54 +219,55 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.10", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "12.1.10", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.2", - "com.unity.render-pipelines.core": "12.1.10", - "com.unity.shadergraph": "12.1.10" + "com.unity.burst": "1.8.4", + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.20.1", + "version": "1.21.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.10", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.10", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { @@ -279,7 +292,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.2", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": { @@ -298,7 +311,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { @@ -389,6 +402,12 @@ "dependencies": {}, "hash": "10864e9fd9b15f6342e9d5326d417b98e0e13e9e" }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.animation": { "version": "1.0.0", "depth": 0, @@ -446,6 +465,12 @@ "source": "builtin", "dependencies": {} }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 2, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.screencapture": { "version": "1.0.0", "depth": 0, @@ -462,26 +487,29 @@ "com.unity.modules.jsonserialize": "1.0.0" } }, - "com.unity.modules.ui": { + "com.unity.modules.terrain": { "version": "1.0.0", - "depth": 0, + "depth": 2, "source": "builtin", "dependencies": {} }, - "com.unity.modules.uielements": { + "com.unity.modules.tilemap": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" + "com.unity.modules.physics2d": "1.0.0" } }, - "com.unity.modules.uielementsnative": { + "com.unity.modules.ui": { "version": "1.0.0", - "depth": 1, + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", diff --git a/unity-renderer/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/unity-renderer/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json index ad11087f42..3c7b4c18bb 100644 --- a/unity-renderer/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json +++ b/unity-renderer/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -1,6 +1,4 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json", "m_Dictionary": { "m_DictionaryValues": [] } diff --git a/unity-renderer/ProjectSettings/ProjectSettings.asset b/unity-renderer/ProjectSettings/ProjectSettings.asset index e18a34adc6..3f6209f3f8 100644 --- a/unity-renderer/ProjectSettings/ProjectSettings.asset +++ b/unity-renderer/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 26 productGUID: ba694a7606b27db49bcb086b36d520cc AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -18,7 +18,7 @@ PlayerSettings: cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} m_ShowUnitySplashScreen: 0 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -119,8 +120,11 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +132,7 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -147,7 +146,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -158,6 +157,7 @@ PlayerSettings: Standalone: com.Decentraland.Decentraland buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -175,12 +175,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 1 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -228,8 +231,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -244,6 +249,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 5 AndroidTargetDevices: 0 @@ -251,6 +257,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 @@ -264,7 +271,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -499,10 +505,12 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: - m_BuildTarget: WebGL m_TextureStreamingEnabled: 0 m_TextureStreamingPriority: 0 + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -515,6 +523,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -526,6 +535,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -741,9 +751,10 @@ PlayerSettings: webGLMemorySize: 512 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 0 webGLDebugSymbols: 1 - webGLEmscriptenArgs: ' --profiling-funcs ' + webGLEmscriptenArgs: ' --profiling-funcs -s ALLOW_MEMORY_GROWTH=1 -s ERROR_ON_UNDEFINED_SYMBOLS=0 ' webGLModulesDirectory: webGLTemplate: PROJECT:decentraland webGLAnalyzeBuildSize: 1 @@ -753,6 +764,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2;GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE;GLTFAST_SAFE @@ -764,8 +781,10 @@ PlayerSettings: Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 + QNX: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: UNITY_POST_PROCESSING_STACK_V2;GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE;GLTFAST_SAFE;UNITASK_DOTWEEN_SUPPORT;IGNORE_UNIVRM_IMPORTERS + VisionOS: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2;GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE;GLTFAST_SAFE;UNITASK_DOTWEEN_SUPPORT;IGNORE_UNIVRM_IMPORTERS Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2 @@ -776,17 +795,15 @@ PlayerSettings: Standalone: 0 il2cppCompilerConfiguration: WebGL: 2 + il2cppCodeGeneration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 1 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 - additionalIl2CppArgs: + additionalIl2CppArgs: ' --emit-source-mapping' scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 3 @@ -862,6 +879,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -872,6 +894,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/unity-renderer/ProjectSettings/ProjectVersion.txt b/unity-renderer/ProjectSettings/ProjectVersion.txt index f8251a7aff..105db72a53 100644 --- a/unity-renderer/ProjectSettings/ProjectVersion.txt +++ b/unity-renderer/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.22f1 -m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3) +m_EditorVersion: 2022.3.6f1 +m_EditorVersionWithRevision: 2022.3.6f1 (b9e6e7e9fa2d) diff --git a/unity-renderer/ProjectSettings/URPProjectSettings.asset b/unity-renderer/ProjectSettings/URPProjectSettings.asset index c1f118ad3f..cd7fd8c61b 100644 --- a/unity-renderer/ProjectSettings/URPProjectSettings.asset +++ b/unity-renderer/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 7 diff --git a/unity-renderer/ProjectSettings/boot.config b/unity-renderer/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_25_0.png b/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_25_0.png index 25618b4116..c6d8c2b7cf 100644 --- a/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_25_0.png +++ b/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_25_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ac55d7420dc6c16840dc513fe91efd5e15051a770cf68a08ecf1e483baa512c -size 432058 +oid sha256:bea53a20ddbba3fc694814c23bf18869e295d86260fc459b140d38cf83d2df69 +size 433289 diff --git a/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_75_0.png b/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_75_0.png index 13eabeff5a..e436e036bd 100644 --- a/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_75_0.png +++ b/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_0_75_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a57919e15344cf1969b93f845f5a448d6c73c354876a4725969463be8c53db36 -size 451257 +oid sha256:b02258d20a5ffcb9c2167e11d1f642d7a4a3e84d0480fc75593d43fd36ec3234 +size 451894 diff --git a/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_1_0.png b/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_1_0.png index e9f0abed63..a833c81e66 100644 --- a/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_1_0.png +++ b/unity-renderer/TestResources/VisualTests/BaselineImages/PBRMaterialVisualTests_AlbedoTexture_AlbedoAlpha_1_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:751e5f215c8f5b47831e757e2c5f316cb21409dd6cc0b1ca118d1c003a93347d -size 454032 +oid sha256:b3b6a4a0b8ab066db4fc1c1437d20c793892db7e5eaf33d93589af8ffed8ca97 +size 454583