diff --git a/.circleci/config.yml b/.circleci/config.yml index a95504ac76..7a92e4f83e 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-1.1.2 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-1.1.2 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-1.1.2 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-1 environment: DCL_OUTPUT_NAME: webgl PROJECT_PATH: /tmp/workspace/unity-renderer/unity-renderer 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 toDispose = new List(); @@ -44,9 +44,10 @@ public OutlinerRenderPass(OutlineRenderersSO outlineRenderersSo) this.outlineRenderersSo = outlineRenderersSo; } - public void Setup(RenderTextureDescriptor descriptor, RenderTargetHandle outlineTextureHandle) + public void Setup(RenderTextureDescriptor descriptor, RTHandle outlineTextureHandle) { this.outlineTextureHandle = outlineTextureHandle; + outlineTextureHandlerShaderNameID = Shader.PropertyToID(outlineTextureHandle.name); descriptor.colorFormat = RenderTextureFormat.ARGB32; descriptor.depthBufferBits = DEPTH_BUFFER_BITS; this.descriptor = descriptor; @@ -55,8 +56,8 @@ public void Setup(RenderTextureDescriptor descriptor, RenderTargetHandle outline public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor) { //Configure CommandBuffer to output the mask result in the provided texture - cmd.GetTemporaryRT(outlineTextureHandle.id, descriptor, FilterMode.Point); - ConfigureTarget(outlineTextureHandle.Identifier()); + cmd.GetTemporaryRT(outlineTextureHandlerShaderNameID, descriptor, FilterMode.Point); + ConfigureTarget(outlineTextureHandle); ConfigureClear(ClearFlag.All, Color.black); } @@ -73,7 +74,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData DrawAvatar(outlineRenderersSo.avatar, renderingData.cameraData.camera.cullingMask, cmd); } - cmd.SetGlobalTexture("_OutlineTexture", outlineTextureHandle.id); + cmd.SetGlobalTexture("_OutlineTexture", outlineTextureHandlerShaderNameID); } context.ExecuteCommandBuffer(cmd); @@ -186,7 +187,7 @@ private void CopyAvatarProperties(Material source, Material target) public override void FrameCleanup(CommandBuffer cmd) { - cmd.ReleaseTemporaryRT(outlineTextureHandle.id); + cmd.ReleaseTemporaryRT(outlineTextureHandlerShaderNameID); for (var index = 0; index < toDispose.Count; index++) { Object.Destroy(toDispose[index]); } @@ -197,7 +198,8 @@ public override void FrameCleanup(CommandBuffer cmd) public OutlineRenderersSO renderers; private OutlinerRenderPass scriptablePass; - private RenderTargetHandle outlineTexture; + private RTHandle outlineTexture; + private const string RENDER_TARGET_PROP_NAME = "_OutlineTexture"; public override void Create() { @@ -206,7 +208,7 @@ public override void Create() renderPassEvent = RenderPassEvent.AfterRenderingTransparents, }; - outlineTexture.Init("_OutlineTexture"); + outlineTexture = RTHandles.Alloc(RENDER_TARGET_PROP_NAME, name: RENDER_TARGET_PROP_NAME); } public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) diff --git a/unity-renderer/Assets/Rendering/Outliner/OutlineScreenEffectFeature.cs b/unity-renderer/Assets/Rendering/Outliner/OutlineScreenEffectFeature.cs index 1207114b7b..0eaea86b20 100644 --- a/unity-renderer/Assets/Rendering/Outliner/OutlineScreenEffectFeature.cs +++ b/unity-renderer/Assets/Rendering/Outliner/OutlineScreenEffectFeature.cs @@ -14,17 +14,23 @@ private class OutlinePass : ScriptableRenderPass private static readonly int BLUR_SIZE = Shader.PropertyToID("_BlurSize"); private static readonly int SIGMA = Shader.PropertyToID("_BlurSigma"); private static readonly int FADE = Shader.PropertyToID("_Fade"); - private static readonly int OUTLINER_EFFECT = Shader.PropertyToID("_OutlinerEffect_Camera"); - private static readonly int OUTLINE_HORIZONTAL = Shader.PropertyToID("_OutlinerEffect_Outline1"); - private static readonly int OUTLINE_VERTICAL = Shader.PropertyToID("_OutlinerEffect_Outline2"); + private static readonly string OUTLINER_EFFECT_PROP = "_OutlinerEffect_Camera"; + private static readonly int OUTLINER_EFFECT = Shader.PropertyToID(OUTLINER_EFFECT_PROP); + private static readonly string OUTLINER_HORIZONTAL_PROP = "_OutlinerEffect_Outline1"; + private static readonly int OUTLINE_HORIZONTAL = Shader.PropertyToID(OUTLINER_HORIZONTAL_PROP); + private static readonly string OUTLINER_VERTICAL_PROP = "_OutlinerEffect_Outline2"; + private static readonly int OUTLINE_VERTICAL = Shader.PropertyToID(OUTLINER_VERTICAL_PROP); + private static readonly int OUTLINE_TEX = Shader.PropertyToID("_OutlineTexture"); + private static readonly string SOURCE_TEX_PROP = "_Source"; + private static readonly string COMPOSE_MASK_TEX_PROP = "_ComposeMask"; private readonly OutlineSettings settings; private const string PROFILER_TAG = "Outline Screen Effect Pass"; private readonly Material material = null; - private RenderTargetIdentifier source { get; set; } - private RenderTargetHandle destination { get; set; } - private RenderTargetHandle outlineMask { get; set; } + private ScriptableRenderer renderer; + // private RTHandle outlineMask { get; set; } + private RTHandle outlineMask; private enum ShaderPasses { @@ -40,17 +46,14 @@ public OutlinePass(OutlineSettings settings) material = CoreUtils.CreateEngineMaterial("DCL/OutlinerEffect"); } - public void Setup(RenderTargetIdentifier source, RenderTargetHandle destination, RenderTargetHandle outlineTexture) + public void Setup(ScriptableRenderer renderer, RTHandle outlineTexture) { - this.source = source; - this.destination = destination; + this.renderer = renderer; this.outlineMask = outlineTexture; } public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) { - if (!IsOutlineAvailable()) return; - material.SetColor(INNER_COLOR, settings.innerColor); material.SetColor(OUTLINE_COLOR, settings.outlineColor); material.SetFloat(OUTLINE_SIZE, settings.outlineThickness); @@ -62,12 +65,12 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData using (new ProfilingScope(cmd, new ProfilingSampler(PROFILER_TAG))) { - RenderTextureDescriptor lowResDescriptor = renderingData.cameraData.cameraTargetDescriptor; RenderTextureDescriptor mainDescriptor = renderingData.cameraData.cameraTargetDescriptor; + // mainDescriptor.depthBufferBits = 0; + RenderTextureDescriptor lowResDescriptor = renderingData.cameraData.cameraTargetDescriptor; // For high resolutions we dont need so much quality and the blur effect gets exponentially expensive so we lower the resolution to full-hd (1920x1080) but maintaining the aspect ratio float resolutionScale = 1; - if (lowResDescriptor.width > 1920) resolutionScale = (1920f * 100f / lowResDescriptor.width) / 100f; @@ -75,36 +78,50 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData lowResDescriptor.height = Mathf.RoundToInt(lowResDescriptor.height * resolutionScale); lowResDescriptor.depthBufferBits = 0; - RenderTargetHandle camera = new RenderTargetHandle { id = OUTLINER_EFFECT }; - RenderTargetHandle outline1 = new RenderTargetHandle { id = OUTLINE_HORIZONTAL }; - RenderTargetHandle outline2 = new RenderTargetHandle { id = OUTLINE_VERTICAL }; - - cmd.GetTemporaryRT(camera.id, mainDescriptor, FilterMode.Point); - cmd.GetTemporaryRT(outline1.id, lowResDescriptor, (FilterMode)settings.filterMode); - cmd.GetTemporaryRT(outline2.id, lowResDescriptor, (FilterMode)settings.filterMode); - - Blit(cmd, outlineMask.id, outline1.id, material, (int)ShaderPasses.Outline); // Get the outline. Output in outline1 - Blit(cmd, outline1.id, outline2.id, material, (int)ShaderPasses.BlurHorizontal); // Apply Vertical blur. Output in outline2 - Blit(cmd, outline2.id, outline1.id, material, (int)ShaderPasses.BlurVertical); // Apply Horizontal blur. Output in outline1 - - Blit(cmd, source, camera.id); // Get camera in a RT - cmd.SetGlobalTexture("_Source", camera.id); // Apply RT as _Source for the material - cmd.SetGlobalTexture("_ComposeMask", outlineMask.id); // Set the original outline mask - - Blit(cmd, outline1.id, source, material, (int)ShaderPasses.Compose); - - cmd.ReleaseTemporaryRT(camera.id); - cmd.ReleaseTemporaryRT(outline1.id); - cmd.ReleaseTemporaryRT(outline2.id); + RTHandle camera = RTHandles.Alloc("_OutlinerEffect_Camera", name: "_OutlinerEffect_Camera"); + RTHandle outline1 = RTHandles.Alloc("_OutlinerEffect_Outline1", name: "_OutlinerEffect_Outline1"); + RTHandle outline2 = RTHandles.Alloc("_OutlinerEffect_Outline2", name: "_OutlinerEffect_Outline2"); + + /*cmd.GetTemporaryRT(Shader.PropertyToID(camera.name), mainDescriptor, FilterMode.Point); + cmd.GetTemporaryRT(Shader.PropertyToID(outline1.name), lowResDescriptor, (FilterMode)settings.filterMode); + cmd.GetTemporaryRT(Shader.PropertyToID(outline2.name), lowResDescriptor, (FilterMode)settings.filterMode);*/ + + // Since 'cmd.GetTemporaryRT()' doesn't seem to be working (it doesn't assign any rt texture), + // 'RenderingUtils.ReAllocateIfNeeded()' at least assigns a texture to these RTHandle instances, avoiding the + // "value cannot be null" error when using Blit(), but the outline effect still doesn't render anything... + RenderingUtils.ReAllocateIfNeeded(ref outlineMask, mainDescriptor); + RenderingUtils.ReAllocateIfNeeded(ref camera, mainDescriptor); + RenderingUtils.ReAllocateIfNeeded(ref outline1, lowResDescriptor, (FilterMode)settings.filterMode); + RenderingUtils.ReAllocateIfNeeded(ref outline2, lowResDescriptor, (FilterMode)settings.filterMode); + + Debug.Log($"PRAVS - outlineTexture EXECUTE - 0 - outlineMask.rt: {outlineMask.rt}; outline1.rt: {outline1.rt}; outline2.rt: {outline2.rt}"); + Debug.Log($"PRAVS - outlineTexture EXECUTE - 1"); + Blit(cmd, outlineMask, outline1, material, (int)ShaderPasses.Outline); // Get the outline. Output in outline1 + Debug.Log($"PRAVS - outlineTexture EXECUTE - 2"); + Blit(cmd, outline1, outline2, material, (int)ShaderPasses.BlurHorizontal); // Apply Vertical blur. Output in outline2 + Debug.Log($"PRAVS - outlineTexture EXECUTE - 3"); + Blit(cmd, outline2, outline1, material, (int)ShaderPasses.BlurVertical); // Apply Horizontal blur. Output in outline1 + + Blit(cmd, renderer.cameraColorTargetHandle, camera); // Get camera in a RT + cmd.SetGlobalTexture("_Source", Shader.PropertyToID(camera.name)); // Apply RT as _Source for the material + cmd.SetGlobalTexture("_ComposeMask", Shader.PropertyToID(outlineMask.name)); // Set the original outline mask + + Blit(cmd, outline1, renderer.cameraColorTargetHandle, material, (int)ShaderPasses.Compose); + + /*cmd.ReleaseTemporaryRT(OUTLINER_EFFECT); + cmd.ReleaseTemporaryRT(OUTLINE_HORIZONTAL); + cmd.ReleaseTemporaryRT(OUTLINE_VERTICAL);*/ + + /*camera.Release(); + outline1.Release(); + outline2.Release(); + outlineMask.Release();*/ } context.ExecuteCommandBuffer(cmd); CommandBufferPool.Release(cmd); } - private static bool IsOutlineAvailable() => - DataStore.i.outliner.avatarOutlined.Get().renderer != null; - public override void FrameCleanup(CommandBuffer cmd) { } } @@ -124,21 +141,30 @@ public class OutlineSettings public OutlineSettings settings = new (); private OutlinePass outlinePass; - private RenderTargetHandle outlineTexture; + private RTHandle outlineTexture; + // private static readonly string OUTLINE_TEXTURE_PROP = "_OutlineTexture"; public override void Create() { outlinePass = new OutlinePass(settings) { - renderPassEvent = RenderPassEvent.AfterRenderingTransparents, + renderPassEvent = RenderPassEvent.AfterRenderingTransparents }; - outlineTexture.Init("_OutlineTexture"); + // Debug.Log("PRAVS - outlineTexture init!"); + outlineTexture = RTHandles.Alloc("_OutlineTexture", name: "_OutlineTexture"); } public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { - outlinePass.Setup(renderer.cameraColorTarget, RenderTargetHandle.CameraTarget, outlineTexture); + if (!IsOutlineAvailable()) return; + + // Debug.Log("PRAVS - AddRenderPasses!"); + // outlinePass.Setup(renderer, RTHandles.Alloc(OUTLINE_TEXTURE_PROP, name: OUTLINE_TEXTURE_PROP), outlineTexture); + outlinePass.Setup(renderer, outlineTexture); renderer.EnqueuePass(outlinePass); } + + private static bool IsOutlineAvailable() => + DataStore.i.outliner.avatarOutlined.Get().renderer != null; } diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02.mat index 5510f4b30e..d0cc2155ec 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02.mat @@ -10,6 +10,8 @@ Material: m_Name: M_Skybox02 m_Shader: {fileID: -6465566751694194690, guid: bf4000fbd9b31784cab1d27368431336, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: 2445 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -49,6 +52,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGLayerParticles_1c423f4cd0624eca9ef3b77eef2eb8d3_Texture2D696c52219a64421abfac24088c8c2d3e_3259457213_Texture2D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SGLayerParticles_1c423f4cd0624eca9ef3b77eef2eb8d3_Texture2Dfc450b2db7f54977a54b88410e0e641d_756302754: m_Texture: {fileID: 2800000, guid: 42cc058140f798e46bde1006aab6fa8b, type: 3} m_Scale: {x: 1, y: 1} @@ -85,6 +92,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SampleCubemap_2dfc65137af0478d9f46ac612f60a309_Cube_1: m_Texture: {fileID: 8900000, guid: b5e77d527d64dd64f8dc715126915af7, type: 3} m_Scale: {x: 1, y: 1} @@ -406,4 +417,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02Cubemap 1.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02Cubemap 1.mat index 7f0bbec19a..c08d9b1fed 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02Cubemap 1.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02Cubemap 1.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 @@ -23,6 +23,8 @@ Material: m_Name: M_Skybox02Cubemap 1 m_Shader: {fileID: -6465566751694194690, guid: bf4000fbd9b31784cab1d27368431336, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: 2999 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,6 +101,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGLayerParticles_1c423f4cd0624eca9ef3b77eef2eb8d3_Texture2D696c52219a64421abfac24088c8c2d3e_3259457213_Texture2D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SGLayerParticles_1c423f4cd0624eca9ef3b77eef2eb8d3_Texture2Dfc450b2db7f54977a54b88410e0e641d_756302754: m_Texture: {fileID: 2800000, guid: 42cc058140f798e46bde1006aab6fa8b, type: 3} m_Scale: {x: 1, y: 1} @@ -142,6 +149,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SGSingleParticle_a39111a06c1d4ae09c0c14f4f23c3ba1_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} @@ -356,6 +367,7 @@ Material: - Vector1_ee4830b881524b7d911e938223ed7a1f: 0 - Vector1_ee4830b881524b7d911e938223ed7a1f_1: 0 - Vector1_ee4830b881524b7d911e938223ed7a1f_2: 0 + - _HorizonGroundAlpha: 1 - _LAYERTYPE_0: 0 - _QueueControl: 1 - _QueueOffset: 0 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02_Original_Settings.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02_Original_Settings.mat index 8fb43fc1c5..88cf3d36fa 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02_Original_Settings.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02_Original_Settings.mat @@ -10,6 +10,8 @@ Material: m_Name: M_Skybox02_Original_Settings m_Shader: {fileID: -6465566751694194690, guid: bf4000fbd9b31784cab1d27368431336, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: 2998 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -45,6 +48,10 @@ Material: m_Texture: {fileID: 2800000, guid: 48fea5cb8b115de4088a6d237efc7d13, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGLayerParticles_1c423f4cd0624eca9ef3b77eef2eb8d3_Texture2D696c52219a64421abfac24088c8c2d3e_3259457213_Texture2D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SGLayerParticles_1c423f4cd0624eca9ef3b77eef2eb8d3_Texture2Dfc450b2db7f54977a54b88410e0e641d_756302754: m_Texture: {fileID: 2800000, guid: 42cc058140f798e46bde1006aab6fa8b, type: 3} m_Scale: {x: 1, y: 1} @@ -81,6 +88,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SampleCubemap_2dfc65137af0478d9f46ac612f60a309_Cube_1: m_Texture: {fileID: 8900000, guid: b5e77d527d64dd64f8dc715126915af7, type: 3} m_Scale: {x: 1, y: 1} @@ -227,6 +238,9 @@ Material: - Vector1_ee4830b881524b7d911e938223ed7a1f: 0 - Vector1_ee4830b881524b7d911e938223ed7a1f_1: 0 - Vector1_ee4830b881524b7d911e938223ed7a1f_2: 0 + - _HorizonGroundAlpha: 1 + - _QueueControl: 1 + - _QueueOffset: 0 - _RenderDistance_0: 3.4 - _RenderDistance_1: 3.4 - _RenderDistance_2: 0 @@ -395,4 +409,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/CloudShader.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/CloudShader.mat index 00a52ae782..f13ecb6c41 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/CloudShader.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/CloudShader.mat @@ -10,6 +10,8 @@ Material: m_Name: CloudShader m_Shader: {fileID: -6465566751694194690, guid: 5502784153f063a439ce0a782f8002e4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -193,4 +196,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/M_MeshClouds.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/M_MeshClouds.mat index e330a852ae..71bac7883e 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/M_MeshClouds.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/CloudS/M_MeshClouds.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 @@ -23,6 +23,8 @@ Material: m_Name: M_MeshClouds m_Shader: {fileID: -6465566751694194690, guid: ad52eeb3245f406418b86fd1218d49d0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_AudioBand.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_AudioBand.mat index efac7130a2..65b61d7ddc 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_AudioBand.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_AudioBand.mat @@ -10,6 +10,8 @@ Material: m_Name: M_AudioBand m_Shader: {fileID: -6465566751694194690, guid: 6617fd24827ba4b4694ec4bfb9ed3d6e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -40,6 +43,8 @@ Material: - Vector1_8cfa2558b0544919a883bf984d585a57: 0.05 - Vector1_9ac13bba089f4b4683bfcd790de4d478: 10 - Vector1_fde1b72eafaf437284f61c99cd74bce7: 13.39 + - _QueueControl: 1 + - _QueueOffset: 0 m_Colors: - Color_adef2a0a87fc4068b2229a34debbc412: {r: 1, g: 0.73474693, b: 0, a: 1} - Color_cfd4464ddd6a4fab9a32eb623c28f7fe: {r: 0.972549, g: 0, b: 0.35625085, a: 1} @@ -56,4 +61,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeCubemap.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeCubemap.mat index 25268e678e..bd0b00d060 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeCubemap.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeCubemap.mat @@ -10,6 +10,8 @@ Material: m_Name: M_DomeCubemap m_Shader: {fileID: -6465566751694194690, guid: 9953ca6188c290e47b7950de04ea51db, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -38,7 +41,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_edf3be6a71f8493ea565de15f9d016af: {r: 1, g: 1, b: 1, a: 1} - Vector3_1385d89751df4f35aa7cf2468529f045: {r: 0, g: 0, b: 0, a: 0} @@ -56,4 +61,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeParticles.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeParticles.mat index e71aab7595..fd17c5995c 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeParticles.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeParticles.mat @@ -10,6 +10,8 @@ Material: m_Name: M_DomeParticles m_Shader: {fileID: -6465566751694194690, guid: 9d173fd60591b4f49b7bd8632f33ffba, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -29,6 +32,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SGSingleParticle_f056e0ba78284dcaac3e44afd38165b5_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} @@ -49,6 +56,8 @@ Material: m_Floats: - Vector1_1d966b932eb6445a9dbcef876a02880f: 1 - Vector1_a3c0b1510b8c44c1a545c4fc2a851241: 70 + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_de8e10a7a2c94f0e954513f70c401c91: {r: 0.112608574, g: 1.5000585, b: 1.5363034, a: 1} @@ -71,4 +80,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomePlannar.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomePlannar.mat index 9678c89180..39adea4391 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomePlannar.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomePlannar.mat @@ -10,6 +10,8 @@ Material: m_Name: M_DomePlannar m_Shader: {fileID: -6465566751694194690, guid: 1bff7ad8dd4528f41bc5db8778692edb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -50,6 +53,8 @@ Material: - Vector1_0c3661af4be04e80af52f7a9ba1b3a27: 45 - Vector1_111fbed745a84242a1ed47d238936cf2: 1 - Vector1_48bdbb7e2e794a97919c03a0641826f6: 1.36 + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_b3bbdc72bdc5482b8411626a2cf7db84: {r: 1, g: 1, b: 1, a: 1} - Vector2_8c3c66c149bf47a6808ce2a34403d766: {r: 0.01, g: -0.05, b: 0, a: 0} @@ -69,4 +74,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSatellite.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSatellite.mat index ecefc9a931..07780252ff 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSatellite.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSatellite.mat @@ -10,6 +10,8 @@ Material: m_Name: M_DomeSatellite m_Shader: {fileID: -6465566751694194690, guid: cabeb4230bec9c44d895427a117c1f3e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -38,7 +41,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_82e255b243584f61a52955831559e287: {r: 1.4700983, g: 2.7137256, b: 0.17254896, a: 0.5686275} @@ -60,4 +65,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 1.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 1.mat index f4cd4e91ce..436d87a9cd 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 1.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 1.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 @@ -23,6 +23,8 @@ Material: m_Name: M_DomeSkybox 1 m_Shader: {fileID: -6465566751694194690, guid: ab8c8d3251a70d541abcb13509438eea, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -50,6 +53,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _cubemap_0: m_Texture: {fileID: 8900000, guid: 2a1f2c34a6bb71040aad59820a39f105, type: 3} m_Scale: {x: 1, y: 1} diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 2.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 2.mat index 5803f6f2aa..1be762f090 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 2.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox 2.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 @@ -23,6 +23,8 @@ Material: m_Name: M_DomeSkybox 2 m_Shader: {fileID: -6465566751694194690, guid: ab8c8d3251a70d541abcb13509438eea, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -50,6 +53,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _cubemap_0: m_Texture: {fileID: 8900000, guid: 2a1f2c34a6bb71040aad59820a39f105, type: 3} m_Scale: {x: 1, y: 1} @@ -82,6 +89,8 @@ Material: m_Floats: - Vector1_0df2ab10152b42e8bc1ff3769855795f: 0 - Vector1_1e1d6744b98b44e6a58172cca5720d78: 0 + - _QueueControl: 0 + - _QueueOffset: 0 - _RenderDistance_0: 3 - _dayTime: 0 - _fadeTime_0: 1 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox.mat index fbb79dc7cd..3590116b94 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/Dome/M_DomeSkybox.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 @@ -23,6 +23,8 @@ Material: m_Name: M_DomeSkybox m_Shader: {fileID: -6465566751694194690, guid: ab8c8d3251a70d541abcb13509438eea, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -50,6 +53,10 @@ Material: m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SGSingleParticle_9b74e1d945554c5ea87d3306f4178581_Texture2Dbd5b8ce37ff545e1be8d418c193ee500_3418281140_Texture2D: + m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _cubemap_0: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/New Material 1.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/New Material 1.mat index 2e3f24b57f..de7c3ff22a 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/New Material 1.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/New Material 1.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: New Material 1 m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -97,6 +100,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -115,6 +119,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -134,6 +139,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _WorkflowMode: 1 - _ZWrite: 0 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_Sparkles.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_Sparkles.mat index a407c983db..0532dfc691 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_Sparkles.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_Sparkles.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Sparkles m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - _SURFACE_TYPE_TRANSPARENT @@ -23,6 +25,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -103,6 +107,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -122,6 +127,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _WorkflowMode: 1 - _ZWrite: 0 @@ -146,4 +152,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_StarTrail.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_StarTrail.mat index e31b0bc16a..d9b3664684 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_StarTrail.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/SkyboxAddressables/ProceduralSkyboxAssets/Meshes/ShootingStar/M_StarTrail.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 @@ -23,6 +23,8 @@ Material: m_Name: M_StarTrail m_Shader: {fileID: -6465566751694194690, guid: 97a3e15386aae2947916e327afb8d14d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/M_3DSatellite.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/M_3DSatellite.mat index 980db999ff..b1c83479cd 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/M_3DSatellite.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/M_3DSatellite.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 @@ -23,6 +23,8 @@ Material: m_Name: M_3DSatellite m_Shader: {fileID: -6465566751694194690, guid: b9a7d213228589e45b083e2d9b5a3d3d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/Prefabs/Satellite.mat b/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/Prefabs/Satellite.mat index 693d5780d3..c823131878 100644 --- a/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/Prefabs/Satellite.mat +++ b/unity-renderer/Assets/Rendering/ProceduralSkybox/ToolProceduralSkybox/Prefabs/Satellite.mat @@ -10,6 +10,8 @@ Material: m_Name: Satellite m_Shader: {fileID: -6465566751694194690, guid: b9a7d213228589e45b083e2d9b5a3d3d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _ENVIRONMENTREFLECTIONS_OFF @@ -20,6 +22,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -108,6 +111,7 @@ Material: - _OcclusionStrength: 1 - _Opacity: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -137,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/unity-renderer/Assets/Rendering/Shaders/URP/UberPost.shader b/unity-renderer/Assets/Rendering/Shaders/URP/UberPost.shader index c7105124fe..018484f88f 100644 --- a/unity-renderer/Assets/Rendering/Shaders/URP/UberPost.shader +++ b/unity-renderer/Assets/Rendering/Shaders/URP/UberPost.shader @@ -1,7 +1,6 @@ Shader "DCL/Universal Render Pipeline/UberPost" { HLSLINCLUDE - #pragma exclude_renderers gles #pragma multi_compile_local_fragment _ _DISTORTION #pragma multi_compile_local_fragment _ _CHROMATIC_ABERRATION #pragma multi_compile_local_fragment _ _BLOOM_LQ _BLOOM_HQ _BLOOM_LQ_DIRT _BLOOM_HQ_DIRT @@ -10,14 +9,25 @@ Shader "DCL/Universal Render Pipeline/UberPost" #pragma multi_compile_local_fragment _ _DITHERING #pragma multi_compile_local_fragment _ _GAMMA_20 _LINEAR_TO_SRGB_CONVERSION #pragma multi_compile_local_fragment _ _USE_FAST_SRGB_LINEAR_CONVERSION - #pragma multi_compile _ _USE_DRAW_PROCEDURAL + #pragma multi_compile_fragment _ _FOVEATED_RENDERING_NON_UNIFORM_RASTER + // Foveated rendering currently not supported in dxc on metal + #pragma never_use_dxc metal #pragma multi_compile_fragment _ DEBUG_DISPLAY + #pragma multi_compile_fragment _ SCREEN_COORD_OVERRIDE + #pragma multi_compile_local_fragment _ HDR_ENCODING #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl" #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Filtering.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/ScreenCoordOverride.hlsl" +#if defined(HDR_ENCODING) + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/HDROutput.hlsl" +#endif + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" #include "Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/Common.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/DebuggingFullscreen.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRendering.hlsl" // Hardcoded dependencies to reduce the number of variants #if _BLOOM_LQ || _BLOOM_HQ || _BLOOM_LQ_DIRT || _BLOOM_HQ_DIRT @@ -34,6 +44,7 @@ Shader "DCL/Universal Render Pipeline/UberPost" TEXTURE2D(_InternalLut); TEXTURE2D(_UserLut); TEXTURE2D(_BlueNoise_Texture); + TEXTURE2D_X(_OverlayUITexture); float4 _Lut_Params; float4 _UserLut_Params; @@ -46,10 +57,14 @@ Shader "DCL/Universal Render Pipeline/UberPost" float _Chroma_Params; half4 _Vignette_Params1; float4 _Vignette_Params2; + #ifdef USING_STEREO_MATRICES + float4 _Vignette_ParamsXR; + #endif float2 _Grain_Params; float4 _Grain_TilingParams; float4 _Bloom_Texture_TexelSize; float4 _Dithering_Params; + float4 _HDROutputLuminanceParams; #define DistCenter _Distortion_Params1.xy #define DistAxis _Distortion_Params1.zw @@ -68,7 +83,12 @@ Shader "DCL/Universal Render Pipeline/UberPost" #define LensDirtIntensity _LensDirt_Intensity.x #define VignetteColor _Vignette_Params1.xyz + #ifdef USING_STEREO_MATRICES + #define VignetteCenterEye0 _Vignette_ParamsXR.xy + #define VignetteCenterEye1 _Vignette_ParamsXR.zw + #else #define VignetteCenter _Vignette_Params2.xy + #endif #define VignetteIntensity _Vignette_Params2.z #define VignetteSmoothness _Vignette_Params2.w #define VignetteRoundness _Vignette_Params1.w @@ -86,6 +106,11 @@ Shader "DCL/Universal Render Pipeline/UberPost" #define DitheringScale _Dithering_Params.xy #define DitheringOffset _Dithering_Params.zw + #define MinNits _HDROutputLuminanceParams.x + #define MaxNits _HDROutputLuminanceParams.y + #define PaperWhite _HDROutputLuminanceParams.z + #define OneOverPaperWhite _HDROutputLuminanceParams.w + float2 DistortUV(float2 uv) { // Note: this variant should never be set with XR @@ -113,11 +138,11 @@ Shader "DCL/Universal Render Pipeline/UberPost" return uv; } - half4 Frag(Varyings input) : SV_Target + half4 FragUberPost(Varyings input) : SV_Target { UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - float2 uv = UnityStereoTransformScreenSpaceTex(input.uv); + float2 uv = SCREEN_COORD_APPLY_SCALEBIAS(UnityStereoTransformScreenSpaceTex(input.texcoord)); float2 uvDistorted = DistortUV(uv); half3 color = (0.0).xxx; @@ -130,15 +155,15 @@ Shader "DCL/Universal Render Pipeline/UberPost" float2 end = uv - coords * dot(coords, coords) * ChromaAmount; float2 delta = (end - uv) / 3.0; - half r = SAMPLE_TEXTURE2D_X(_SourceTex, sampler_LinearClamp, uvDistorted ).x; - half g = SAMPLE_TEXTURE2D_X(_SourceTex, sampler_LinearClamp, DistortUV(delta + uv) ).y; - half b = SAMPLE_TEXTURE2D_X(_SourceTex, sampler_LinearClamp, DistortUV(delta * 2.0 + uv)).z; + half r = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, SCREEN_COORD_REMOVE_SCALEBIAS(uvDistorted) ).x; + half g = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, SCREEN_COORD_REMOVE_SCALEBIAS(DistortUV(delta + uv) )).y; + half b = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, SCREEN_COORD_REMOVE_SCALEBIAS(DistortUV(delta * 2.0 + uv))).z; color = half3(r, g, b); } #else { - color = SAMPLE_TEXTURE2D_X(_SourceTex, sampler_LinearClamp, uvDistorted).xyz; + color = SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, SCREEN_COORD_REMOVE_SCALEBIAS(uvDistorted)).xyz; } #endif @@ -151,10 +176,15 @@ Shader "DCL/Universal Render Pipeline/UberPost" #if defined(BLOOM) { - #if _BLOOM_HQ && !defined(SHADER_API_GLES) - half4 bloom = SampleTexture2DBicubic(TEXTURE2D_X_ARGS(_Bloom_Texture, sampler_LinearClamp), uvDistorted, _Bloom_Texture_TexelSize.zwxy, (1.0).xx, unity_StereoEyeIndex); + float2 uvBloom = uvDistorted; + #if defined(_FOVEATED_RENDERING_NON_UNIFORM_RASTER) + uvBloom = RemapFoveatedRenderingNonUniformToLinear(uvBloom); + #endif + + #if _BLOOM_HQ + half4 bloom = SampleTexture2DBicubic(TEXTURE2D_X_ARGS(_Bloom_Texture, sampler_LinearClamp), SCREEN_COORD_REMOVE_SCALEBIAS(uvBloom), _Bloom_Texture_TexelSize.zwxy, (1.0).xx, unity_StereoEyeIndex); #else - half4 bloom = SAMPLE_TEXTURE2D_X(_Bloom_Texture, sampler_LinearClamp, uvDistorted); + half4 bloom = SAMPLE_TEXTURE2D_X(_Bloom_Texture, sampler_LinearClamp, SCREEN_COORD_REMOVE_SCALEBIAS(uvBloom)); #endif #if UNITY_COLORSPACE_GAMMA @@ -191,6 +221,12 @@ Shader "DCL/Universal Render Pipeline/UberPost" UNITY_BRANCH if (VignetteIntensity > 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 +237,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 +255,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; @@ -252,9 +296,9 @@ 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..b814c20ea0 100644 --- a/unity-renderer/Assets/Rendering/UI/Blur/GaussianBlurHandler.cs +++ b/unity-renderer/Assets/Rendering/UI/Blur/GaussianBlurHandler.cs @@ -20,7 +20,7 @@ public class GaussianBlurSettings public string targetName = "_blurTexture"; } - + [SerializeField] public GaussianBlurSettings settings = new GaussianBlurSettings(); public class GaussianBlurPass : ScriptableRenderPass @@ -37,11 +37,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) @@ -77,7 +77,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData //first pass cmd.SetGlobalFloat("_offset", 1.5f); - cmd.Blit(source, tmpRT1, blurMat); + cmd.Blit(renderer.cameraColorTargetHandle, tmpRT1, blurMat); for (int i = 1; i < passes - 1; i++) { @@ -118,8 +118,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/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..d97138d1bd 100644 --- a/unity-renderer/ProjectSettings/ProjectSettings.asset +++ b/unity-renderer/ProjectSettings/ProjectSettings.asset @@ -1,877 +1,900 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!129 &1 -PlayerSettings: - m_ObjectHideFlags: 0 - serializedVersion: 24 - productGUID: ba694a7606b27db49bcb086b36d520cc - AndroidProfiler: 0 - AndroidFilterTouchesWhenObscured: 0 - AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 - targetDevice: 2 - useOnDemandResources: 0 - accelerometerFrequency: 60 - companyName: Decentraland - productName: Decentraland - defaultCursor: {fileID: 0} - cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} - m_ShowUnitySplashScreen: 0 - m_ShowUnitySplashLogo: 1 - m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 1 - m_SplashScreenLogoStyle: 0 - m_SplashScreenDrawMode: 0 - m_SplashScreenBackgroundAnimationZoom: 1 - m_SplashScreenLogoAnimationZoom: 1 - m_SplashScreenBackgroundLandscapeAspect: 1 - m_SplashScreenBackgroundPortraitAspect: 1 - m_SplashScreenBackgroundLandscapeUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenBackgroundPortraitUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 - m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 - m_MTRendering: 1 - mipStripping: 0 - numberOfMipsStripped: 0 - m_StackTraceTypes: 010000000100000001000000010000000100000001000000 - iosShowActivityIndicatorOnLoading: -1 - androidShowActivityIndicatorOnLoading: -1 - iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 - allowedAutorotateToPortrait: 1 - allowedAutorotateToPortraitUpsideDown: 1 - allowedAutorotateToLandscapeRight: 1 - allowedAutorotateToLandscapeLeft: 1 - useOSAutorotation: 1 - use32BitDisplayBuffer: 1 - preserveFramebufferAlpha: 0 - disableDepthAndStencilBuffers: 0 - androidStartInFullscreen: 1 - androidRenderOutsideSafeArea: 0 - androidUseSwappy: 0 - androidBlitType: 1 - androidResizableWindow: 0 - androidDefaultWindowWidth: 1920 - androidDefaultWindowHeight: 1080 - androidMinimumWindowWidth: 400 - androidMinimumWindowHeight: 300 - androidFullscreenMode: 1 - defaultIsNativeResolution: 1 - macRetinaSupport: 1 - runInBackground: 1 - captureSingleScreen: 0 - muteOtherAudioSources: 0 - Prepare IOS For Recording: 0 - Force IOS Speakers When Recording: 0 - deferSystemGesturesMode: 0 - hideHomeButton: 0 - submitAnalytics: 0 - usePlayerLog: 1 - bakeCollisionMeshes: 1 - forceSingleInstance: 0 - useFlipModelSwapchain: 1 - resizableWindow: 0 - useMacAppStoreValidation: 0 - macAppStoreCategory: public.app-category.games - gpuSkinning: 1 - xboxPIXTextureCapture: 0 - xboxEnableAvatar: 0 - xboxEnableKinect: 0 - xboxEnableKinectAutoTracking: 0 - xboxEnableFitness: 0 - visibleInBackground: 1 - allowFullscreenSwitch: 1 - fullscreenMode: 1 - xboxSpeechDB: 0 - xboxEnableHeadOrientation: 0 - xboxEnableGuest: 0 - xboxEnablePIXSampling: 0 - metalFramebufferOnly: 0 - xboxOneResolution: 0 - xboxOneSResolution: 0 - xboxOneXResolution: 3 - xboxOneMonoLoggingLevel: 0 - xboxOneLoggingLevel: 1 - xboxOneDisableEsram: 0 - xboxOneEnableTypeOptimization: 0 - xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 0 - switchQueueControlMemory: 16384 - switchQueueComputeMemory: 262144 - switchNVNShaderPoolsGranularity: 33554432 - switchNVNDefaultPoolsGranularity: 16777216 - switchNVNOtherPoolsGranularity: 16777216 - switchNVNMaxPublicTextureIDCount: 0 - switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 - vulkanNumSwapchainBuffers: 3 - vulkanEnableSetSRGBWrite: 0 - vulkanEnablePreTransform: 0 - vulkanEnableLateAcquireNextImage: 0 - vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 0.1 - preloadedAssets: [] - metroInputSource: 0 - wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 - vrSettings: - enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 - enableFrameTimingStats: 0 - enableOpenGLProfilerGPURecorders: 1 - useHDRDisplay: 0 - D3DHDRBitDepth: 0 - m_ColorGamuts: 00000000 - targetPixelDensity: 30 - resolutionScalingMode: 0 - resetResolutionOnWindowResize: 0 - androidSupportedAspectRatio: 1 - androidMaxAspectRatio: 2.1 - applicationIdentifier: - Standalone: com.Decentraland.Decentraland - buildNumber: - Standalone: 0 - iPhone: 0 - tvOS: 0 - overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 0 - AndroidPreferredInstallLocation: 1 - aotOptions: - stripEngineCode: 1 - iPhoneStrippingLevel: 0 - iPhoneScriptCallOptimization: 0 - ForceInternetPermission: 0 - ForceSDCardPermission: 0 - CreateWallpaper: 0 - APKExpansionFiles: 0 - keepLoadedShadersAlive: 1 - StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 4054 - iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 - tvOSSdkVersion: 0 - tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 - uIPrerenderedIcon: 0 - uIRequiresPersistentWiFi: 0 - uIRequiresFullScreen: 1 - uIStatusBarHidden: 1 - uIExitOnSuspend: 0 - uIStatusBarStyle: 0 - appleTVSplashScreen: {fileID: 0} - appleTVSplashScreen2x: {fileID: 0} - tvOSSmallIconLayers: [] - tvOSSmallIconLayers2x: [] - tvOSLargeIconLayers: [] - tvOSLargeIconLayers2x: [] - tvOSTopShelfImageLayers: [] - tvOSTopShelfImageLayers2x: [] - tvOSTopShelfImageWideLayers: [] - tvOSTopShelfImageWideLayers2x: [] - iOSLaunchScreenType: 0 - iOSLaunchScreenPortrait: {fileID: 0} - iOSLaunchScreenLandscape: {fileID: 0} - iOSLaunchScreenBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreenFillPct: 100 - iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSLaunchScreenCustomStoryboardPath: - iOSLaunchScreeniPadCustomStoryboardPath: - iOSDeviceRequirements: [] - iOSURLSchemes: [] - macOSURLSchemes: [] - iOSBackgroundModes: 0 - iOSMetalForceHardShadows: 0 - metalEditorSupport: 1 - metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 0 - iosCopyPluginsCodeInsteadOfSymlink: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: - iOSManualSigningProvisioningProfileType: 0 - tvOSManualSigningProvisioningProfileType: 0 - appleEnableAutomaticSigning: 0 - iOSRequireARKit: 0 - iOSAutomaticallyDetectAndAddCapabilities: 1 - appleEnableProMotion: 0 - shaderPrecisionModel: 0 - clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea - templatePackageId: com.unity.3d@1.0.2 - templateDefaultScene: Assets/Scenes/SampleScene.unity - useCustomMainManifest: 0 - useCustomLauncherManifest: 0 - useCustomMainGradleTemplate: 0 - useCustomLauncherGradleManifest: 0 - useCustomBaseGradleTemplate: 0 - useCustomGradlePropertiesTemplate: 0 - useCustomProguardFile: 0 - AndroidTargetArchitectures: 5 - AndroidTargetDevices: 0 - AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: ' - AndroidKeyaliasName: - AndroidBuildApkPerCpuArchitecture: 0 - AndroidTVCompatibility: 1 - AndroidIsGame: 1 - AndroidEnableTango: 0 - androidEnableBanner: 1 - androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 - m_AndroidBanners: - - width: 320 - height: 180 - banner: {fileID: 0} - androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 - AndroidMinifyRelease: 0 - AndroidMinifyDebug: 0 - AndroidValidateAppBundleSize: 1 - AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: ea6fac4bffb934ed7bac25adbadc1ad9, type: 3} - m_Width: 128 - m_Height: 128 - m_Kind: 0 - - m_BuildTarget: Standalone - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: ea6fac4bffb934ed7bac25adbadc1ad9, type: 3} - m_Width: 1024 - m_Height: 1024 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 512 - m_Height: 512 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 256 - m_Height: 256 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 128 - m_Height: 128 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 64 - m_Height: 64 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 48 - m_Height: 48 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 32 - m_Height: 32 - m_Kind: 0 - - serializedVersion: 2 - m_Icon: {fileID: 0} - m_Width: 16 - m_Height: 16 - m_Kind: 0 - m_BuildTargetPlatformIcons: - - m_BuildTarget: iPhone - m_Icons: - - m_Textures: [] - m_Width: 180 - m_Height: 180 - m_Kind: 0 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 120 - m_Height: 120 - m_Kind: 0 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 167 - m_Height: 167 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 152 - m_Height: 152 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 76 - m_Height: 76 - m_Kind: 0 - m_SubKind: iPad - - m_Textures: [] - m_Width: 120 - m_Height: 120 - m_Kind: 3 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 80 - m_Height: 80 - m_Kind: 3 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 80 - m_Height: 80 - m_Kind: 3 - m_SubKind: iPad - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 3 - m_SubKind: iPad - - m_Textures: [] - m_Width: 87 - m_Height: 87 - m_Kind: 1 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 58 - m_Height: 58 - m_Kind: 1 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 29 - m_Height: 29 - m_Kind: 1 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 58 - m_Height: 58 - m_Kind: 1 - m_SubKind: iPad - - m_Textures: [] - m_Width: 29 - m_Height: 29 - m_Kind: 1 - m_SubKind: iPad - - m_Textures: [] - m_Width: 60 - m_Height: 60 - m_Kind: 2 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 2 - m_SubKind: iPhone - - m_Textures: [] - m_Width: 40 - m_Height: 40 - m_Kind: 2 - m_SubKind: iPad - - m_Textures: [] - m_Width: 20 - m_Height: 20 - m_Kind: 2 - m_SubKind: iPad - - m_Textures: [] - m_Width: 1024 - m_Height: 1024 - m_Kind: 4 - m_SubKind: App Store - m_BuildTargetBatching: - - m_BuildTarget: Standalone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: tvOS - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: Android - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: iPhone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: WebGL - m_StaticBatching: 1 - m_DynamicBatching: 1 - m_BuildTargetShaderSettings: [] - m_BuildTargetGraphicsJobs: - - m_BuildTarget: MacStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: Switch - m_GraphicsJobs: 0 - - m_BuildTarget: MetroSupport - m_GraphicsJobs: 0 - - m_BuildTarget: AppleTVSupport - m_GraphicsJobs: 0 - - m_BuildTarget: BJMSupport - m_GraphicsJobs: 0 - - m_BuildTarget: LinuxStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: PS4Player - m_GraphicsJobs: 0 - - m_BuildTarget: iOSSupport - m_GraphicsJobs: 0 - - m_BuildTarget: WindowsStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: XboxOnePlayer - m_GraphicsJobs: 0 - - m_BuildTarget: LuminSupport - m_GraphicsJobs: 0 - - m_BuildTarget: AndroidPlayer - m_GraphicsJobs: 0 - - m_BuildTarget: WebGLSupport - m_GraphicsJobs: 0 - m_BuildTargetGraphicsJobMode: - - m_BuildTarget: PS4Player - m_GraphicsJobMode: 0 - - m_BuildTarget: XboxOnePlayer - m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: - - m_BuildTarget: AndroidPlayer - m_APIs: 0b00000008000000 - m_Automatic: 0 - - m_BuildTarget: iOSSupport - m_APIs: 10000000 - m_Automatic: 1 - - m_BuildTarget: AppleTVSupport - m_APIs: 10000000 - m_Automatic: 1 - - m_BuildTarget: WebGLSupport - m_APIs: 0b000000 - m_Automatic: 0 - - m_BuildTarget: LinuxStandaloneSupport - m_APIs: 11000000 - m_Automatic: 0 - m_BuildTargetVRSettings: - - m_BuildTarget: Standalone - m_Enabled: 0 - m_Devices: - - Oculus - - OpenVR - m_DefaultShaderChunkSizeInMB: 16 - m_DefaultShaderChunkCount: 0 - openGLRequireES31: 0 - openGLRequireES31AEP: 0 - openGLRequireES32: 0 - m_TemplateCustomTags: {} - mobileMTRendering: - Android: 1 - iPhone: 1 - tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: [] - m_BuildTargetGroupLightmapSettings: - - m_BuildTarget: WebGL - m_TextureStreamingEnabled: 0 - m_TextureStreamingPriority: 0 - m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] - playModeTestRunnerEnabled: 0 - runPlayModeTestAsEditModeTest: 0 - actionOnDotNetUnhandledException: 1 - enableInternalProfiler: 0 - logObjCUncaughtExceptions: 1 - enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - bluetoothUsageDescription: - switchNMETAOverride: - switchNetLibKey: - switchSocketMemoryPoolSize: 6144 - switchSocketAllocatorPoolSize: 128 - switchSocketConcurrencyLimit: 14 - switchScreenResolutionBehavior: 2 - switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 - switchLTOSetting: 0 - switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchTitleNames_15: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchPublisherNames_15: - switchIcons_0: {fileID: 0} - switchIcons_1: {fileID: 0} - switchIcons_2: {fileID: 0} - switchIcons_3: {fileID: 0} - switchIcons_4: {fileID: 0} - switchIcons_5: {fileID: 0} - switchIcons_6: {fileID: 0} - switchIcons_7: {fileID: 0} - switchIcons_8: {fileID: 0} - switchIcons_9: {fileID: 0} - switchIcons_10: {fileID: 0} - switchIcons_11: {fileID: 0} - switchIcons_12: {fileID: 0} - switchIcons_13: {fileID: 0} - switchIcons_14: {fileID: 0} - switchIcons_15: {fileID: 0} - switchSmallIcons_0: {fileID: 0} - switchSmallIcons_1: {fileID: 0} - switchSmallIcons_2: {fileID: 0} - switchSmallIcons_3: {fileID: 0} - switchSmallIcons_4: {fileID: 0} - switchSmallIcons_5: {fileID: 0} - switchSmallIcons_6: {fileID: 0} - switchSmallIcons_7: {fileID: 0} - switchSmallIcons_8: {fileID: 0} - switchSmallIcons_9: {fileID: 0} - switchSmallIcons_10: {fileID: 0} - switchSmallIcons_11: {fileID: 0} - switchSmallIcons_12: {fileID: 0} - switchSmallIcons_13: {fileID: 0} - switchSmallIcons_14: {fileID: 0} - switchSmallIcons_15: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: - switchMainThreadStackSize: 1048576 - switchPresenceGroupId: - switchLogoHandling: 0 - switchReleaseVersion: 0 - switchDisplayVersion: 1.0.0 - switchStartupUserAccount: 0 - switchSupportedLanguagesMask: 0 - switchLogoType: 0 - switchApplicationErrorCodeCategory: - switchUserAccountSaveDataSize: 0 - switchUserAccountSaveDataJournalSize: 0 - switchApplicationAttribute: 0 - switchCardSpecSize: -1 - switchCardSpecClock: -1 - switchRatingsMask: 0 - switchRatingsInt_0: 0 - switchRatingsInt_1: 0 - switchRatingsInt_2: 0 - switchRatingsInt_3: 0 - switchRatingsInt_4: 0 - switchRatingsInt_5: 0 - switchRatingsInt_6: 0 - switchRatingsInt_7: 0 - switchRatingsInt_8: 0 - switchRatingsInt_9: 0 - switchRatingsInt_10: 0 - switchRatingsInt_11: 0 - switchRatingsInt_12: 0 - switchLocalCommunicationIds_0: - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: - switchParentalControl: 0 - switchAllowsScreenshot: 1 - switchAllowsVideoCapturing: 1 - switchAllowsRuntimeAddOnContentInstall: 0 - switchDataLossConfirmation: 0 - switchUserAccountLockEnabled: 0 - switchSystemResourceMemory: 16777216 - switchSupportedNpadStyles: 3 - switchNativeFsCacheSize: 32 - switchIsHoldTypeHorizontal: 0 - switchSupportedNpadCount: 8 - switchEnableTouchScreen: 1 - switchSocketConfigEnabled: 0 - switchTcpInitialSendBufferSize: 32 - switchTcpInitialReceiveBufferSize: 64 - switchTcpAutoSendBufferSizeMax: 256 - switchTcpAutoReceiveBufferSizeMax: 256 - switchUdpSendBufferSize: 9 - switchUdpReceiveBufferSize: 42 - switchSocketBufferEfficiency: 4 - switchSocketInitializeEnabled: 1 - switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 - switchUseNewStyleFilepaths: 0 - switchUseLegacyFmodPriorities: 1 - switchUseMicroSleepForYield: 1 - switchEnableRamDiskSupport: 0 - switchMicroSleepForYieldTime: 25 - switchRamDiskSpaceSize: 12 - ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: - ps4ParentalLevel: 11 - ps4ContentID: ED1633-NPXX51362_00-0000000000000000 - ps4Category: 0 - ps4MasterVersion: 01.00 - ps4AppVersion: 01.00 - ps4AppType: 0 - ps4ParamSfxPath: - ps4VideoOutPixelFormat: 0 - ps4VideoOutInitialWidth: 1920 - ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 60 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: - ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: - ps4PlayTogetherPlayerCount: 0 - ps4EnterButtonAssignment: 1 - ps4ApplicationParam1: 0 - ps4ApplicationParam2: 0 - ps4ApplicationParam3: 0 - ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 - ps4GarlicHeapSize: 2048 - ps4ProGarlicHeapSize: 2560 - playerPrefsMaxSize: 32768 - ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps4pnSessions: 1 - ps4pnPresence: 1 - ps4pnFriends: 1 - ps4pnGameCustomData: 1 - playerPrefsSupport: 0 - enableApplicationExit: 0 - resetTempFolder: 1 - restrictedAudioUsageRights: 0 - ps4UseResolutionFallback: 0 - ps4ReprojectionSupport: 0 - ps4UseAudio3dBackend: 0 - ps4UseLowGarlicFragmentationMode: 1 - ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 0 - ps4Audio3dVirtualSpeakerCount: 14 - ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: - ps4PatchDayOne: 0 - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4attribExclusiveVR: 0 - ps4disableAutoHideSplash: 0 - ps4videoRecordingFeaturesUsed: 0 - ps4contentSearchFeaturesUsed: 0 - ps4CompatibilityPS5: 0 - ps4AllowPS5Detection: 0 - ps4GPU800MHz: 1 - ps4attribEyeToEyeDistanceSettingVR: 0 - ps4IncludedModules: [] - ps4attribVROutputEnabled: 0 - monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 0} - splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 - spritePackerPolicy: - webGLMemorySize: 512 - webGLExceptionSupport: 1 - webGLNameFilesAsHashes: 0 - webGLDataCaching: 0 - webGLDebugSymbols: 1 - webGLEmscriptenArgs: ' --profiling-funcs ' - webGLModulesDirectory: - webGLTemplate: PROJECT:decentraland - webGLAnalyzeBuildSize: 1 - webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 2 - webGLWasmArithmeticExceptions: 1 - webGLLinkerTarget: 1 - webGLThreadsSupport: 0 - webGLDecompressionFallback: 0 - webGLPowerPreference: 2 - scriptingDefineSymbols: - : UNITY_POST_PROCESSING_STACK_V2;GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE;GLTFAST_SAFE - Android: UNITY_POST_PROCESSING_STACK_V2 - CloudRendering: UNITY_POST_PROCESSING_STACK_V2 - EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 - GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 - Lumin: UNITY_POST_PROCESSING_STACK_V2 - Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 - PS4: UNITY_POST_PROCESSING_STACK_V2 - PS5: 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 - 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 - tvOS: UNITY_POST_PROCESSING_STACK_V2 - additionalCompilerArguments: {} - platformArchitecture: {} - scriptingBackend: - Standalone: 0 - il2cppCompilerConfiguration: - WebGL: 2 - managedStrippingLevel: {} - incrementalIl2cppBuild: {} - suppressCommonWarnings: 1 - allowUnsafeCode: 1 - useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 - additionalIl2CppArgs: - scriptingRuntimeVersion: 1 - gcIncremental: 1 - assemblyVersionValidation: 1 - gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: - Standalone: 3 - WebGL: 6 - m_RenderingPath: 1 - m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_3D - wsaImages: {} - metroTileShortName: - metroTileShowName: 0 - metroMediumTileShowName: 0 - metroLargeTileShowName: 0 - metroWideTileShowName: 0 - metroSupportStreamingInstall: 0 - metroLastRequiredScene: 0 - metroDefaultTileSize: 1 - metroTileForegroundText: 2 - metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, - a: 1} - metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroTargetDeviceFamilies: {} - metroFTAName: - metroFTAFileTypes: [] - metroProtocolName: - vcxProjDefaultLanguage: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: - XboxOneVersion: 1.0.0.0 - XboxOnePackageEncryption: 0 - XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: - XboxOneLanguage: - - enus - XboxOneCapability: [] - XboxOneGameRating: {} - XboxOneIsContentPackage: 0 - XboxOneEnhancedXboxCompatibilityMode: 0 - XboxOneEnableGPUVariability: 0 - XboxOneSockets: {} - XboxOneSplashScreen: {fileID: 0} - XboxOneAllowedProductIds: [] - XboxOnePersistentLocalStorageSize: 0 - XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: - vrEditorSettings: {} - cloudServicesEnabled: - UNet: 1 - luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: - luminCert: - m_CertPath: - m_SignPackage: 1 - luminIsChannelApp: 0 - luminVersion: - m_VersionCode: 1 - m_VersionName: - apiCompatibilityLevel: 6 - activeInputHandler: 0 - windowsGamepadBackendHint: 0 - cloudProjectId: - framebufferDepthMemorylessMode: 0 - qualitySettingsNames: [] - projectName: - organizationId: - cloudEnabled: 0 - legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 - virtualTexturingSupportEnabled: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!129 &1 +PlayerSettings: + m_ObjectHideFlags: 0 + serializedVersion: 26 + productGUID: ba694a7606b27db49bcb086b36d520cc + AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 + AndroidEnableSustainedPerformanceMode: 0 + defaultScreenOrientation: 4 + targetDevice: 2 + useOnDemandResources: 0 + accelerometerFrequency: 60 + companyName: Decentraland + productName: Decentraland + defaultCursor: {fileID: 0} + cursorHotspot: {x: 0, y: 0} + m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} + m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 1 + m_SplashScreenOverlayOpacity: 1 + m_SplashScreenAnimation: 1 + m_SplashScreenLogoStyle: 0 + m_SplashScreenDrawMode: 0 + m_SplashScreenBackgroundAnimationZoom: 1 + m_SplashScreenLogoAnimationZoom: 1 + m_SplashScreenBackgroundLandscapeAspect: 1 + m_SplashScreenBackgroundPortraitAspect: 1 + m_SplashScreenBackgroundLandscapeUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenBackgroundPortraitUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenLogos: [] + m_VirtualRealitySplashScreen: {fileID: 0} + m_HolographicTrackingLossScreen: {fileID: 0} + defaultScreenWidth: 1024 + defaultScreenHeight: 768 + defaultScreenWidthWeb: 960 + 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 + allowedAutorotateToPortrait: 1 + allowedAutorotateToPortraitUpsideDown: 1 + allowedAutorotateToLandscapeRight: 1 + allowedAutorotateToLandscapeLeft: 1 + useOSAutorotation: 1 + use32BitDisplayBuffer: 1 + preserveFramebufferAlpha: 0 + disableDepthAndStencilBuffers: 0 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 + androidBlitType: 1 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 + defaultIsNativeResolution: 1 + macRetinaSupport: 1 + runInBackground: 1 + captureSingleScreen: 0 + muteOtherAudioSources: 0 + Prepare IOS For Recording: 0 + Force IOS Speakers When Recording: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 + submitAnalytics: 0 + usePlayerLog: 1 + bakeCollisionMeshes: 1 + forceSingleInstance: 0 + useFlipModelSwapchain: 1 + resizableWindow: 0 + useMacAppStoreValidation: 0 + macAppStoreCategory: public.app-category.games + gpuSkinning: 1 + xboxPIXTextureCapture: 0 + xboxEnableAvatar: 0 + xboxEnableKinect: 0 + xboxEnableKinectAutoTracking: 0 + xboxEnableFitness: 0 + visibleInBackground: 1 + allowFullscreenSwitch: 1 + fullscreenMode: 1 + xboxSpeechDB: 0 + xboxEnableHeadOrientation: 0 + xboxEnableGuest: 0 + xboxEnablePIXSampling: 0 + metalFramebufferOnly: 0 + xboxOneResolution: 0 + xboxOneSResolution: 0 + xboxOneXResolution: 3 + xboxOneMonoLoggingLevel: 0 + xboxOneLoggingLevel: 1 + xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 + xboxOnePresentImmediateThreshold: 0 + switchQueueCommandMemory: 0 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 + vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 + loadStoreDebugModeEnabled: 0 + bundleVersion: 0.1 + preloadedAssets: [] + metroInputSource: 0 + wsaTransparentSwapchain: 0 + m_HolographicPauseOnTrackingLoss: 1 + xboxOneDisableKinectGpuReservation: 0 + xboxOneEnable7thCore: 0 + vrSettings: + enable360StereoCapture: 0 + isWsaHolographicRemotingEnabled: 0 + enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + useHDRDisplay: 0 + hdrBitDepth: 0 + m_ColorGamuts: 00000000 + targetPixelDensity: 30 + resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 + applicationIdentifier: + Standalone: com.Decentraland.Decentraland + buildNumber: + Standalone: 0 + VisionOS: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 + AndroidBundleVersionCode: 1 + AndroidMinSdkVersion: 22 + AndroidTargetSdkVersion: 0 + AndroidPreferredInstallLocation: 1 + aotOptions: + stripEngineCode: 1 + iPhoneStrippingLevel: 0 + iPhoneScriptCallOptimization: 0 + ForceInternetPermission: 0 + ForceSDCardPermission: 0 + CreateWallpaper: 0 + APKExpansionFiles: 0 + keepLoadedShadersAlive: 1 + StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 + VertexChannelCompressionMask: 4054 + iPhoneSdkVersion: 988 + iOSTargetOSVersionString: 12.0 + tvOSSdkVersion: 0 + tvOSRequireExtendedGameController: 0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 + uIPrerenderedIcon: 0 + uIRequiresPersistentWiFi: 0 + uIRequiresFullScreen: 1 + uIStatusBarHidden: 1 + uIExitOnSuspend: 0 + uIStatusBarStyle: 0 + appleTVSplashScreen: {fileID: 0} + appleTVSplashScreen2x: {fileID: 0} + tvOSSmallIconLayers: [] + tvOSSmallIconLayers2x: [] + tvOSLargeIconLayers: [] + tvOSLargeIconLayers2x: [] + tvOSTopShelfImageLayers: [] + tvOSTopShelfImageLayers2x: [] + tvOSTopShelfImageWideLayers: [] + tvOSTopShelfImageWideLayers2x: [] + iOSLaunchScreenType: 0 + iOSLaunchScreenPortrait: {fileID: 0} + iOSLaunchScreenLandscape: {fileID: 0} + iOSLaunchScreenBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreenFillPct: 100 + iOSLaunchScreenSize: 100 + iOSLaunchScreenCustomXibPath: + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: + iOSDeviceRequirements: [] + iOSURLSchemes: [] + macOSURLSchemes: [] + iOSBackgroundModes: 0 + iOSMetalForceHardShadows: 0 + metalEditorSupport: 1 + metalAPIValidation: 1 + iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 + appleEnableAutomaticSigning: 0 + iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 + appleEnableProMotion: 0 + shaderPrecisionModel: 0 + clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea + templatePackageId: com.unity.3d@1.0.2 + templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 + useCustomProguardFile: 0 + AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 + AndroidSplashScreenScale: 0 + androidSplashScreen: {fileID: 0} + AndroidKeystoreName: '{inproject}: ' + AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidBuildApkPerCpuArchitecture: 0 + AndroidTVCompatibility: 1 + AndroidIsGame: 1 + AndroidEnableTango: 0 + androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 + m_AndroidBanners: + - width: 320 + height: 180 + banner: {fileID: 0} + androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: ea6fac4bffb934ed7bac25adbadc1ad9, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 + - m_BuildTarget: Standalone + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: ea6fac4bffb934ed7bac25adbadc1ad9, type: 3} + m_Width: 1024 + m_Height: 1024 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 512 + m_Height: 512 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 256 + m_Height: 256 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 128 + m_Height: 128 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 64 + m_Height: 64 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 48 + m_Height: 48 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 32 + m_Height: 32 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 16 + m_Height: 16 + m_Kind: 0 + m_BuildTargetPlatformIcons: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + m_BuildTargetBatching: + - m_BuildTarget: Standalone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: tvOS + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: Android + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: iPhone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 1 + m_DynamicBatching: 1 + m_BuildTargetShaderSettings: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: AndroidPlayer + m_APIs: 0b00000008000000 + m_Automatic: 0 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AppleTVSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: WebGLSupport + m_APIs: 0b000000 + m_Automatic: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_APIs: 11000000 + m_Automatic: 0 + m_BuildTargetVRSettings: + - m_BuildTarget: Standalone + m_Enabled: 0 + m_Devices: + - Oculus + - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 + openGLRequireES31: 0 + openGLRequireES31AEP: 0 + openGLRequireES32: 0 + m_TemplateCustomTags: {} + mobileMTRendering: + Android: 1 + 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 + runPlayModeTestAsEditModeTest: 0 + actionOnDotNetUnhandledException: 1 + enableInternalProfiler: 0 + logObjCUncaughtExceptions: 1 + enableCrashReportAPI: 0 + cameraUsageDescription: + locationUsageDescription: + microphoneUsageDescription: + bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 + switchNMETAOverride: + switchNetLibKey: + switchSocketMemoryPoolSize: 6144 + switchSocketAllocatorPoolSize: 128 + switchSocketConcurrencyLimit: 14 + switchScreenResolutionBehavior: 2 + switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 + switchLTOSetting: 0 + switchApplicationID: 0x01004b9000490000 + switchNSODependencies: + switchCompilerFlags: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchTitleNames_15: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchPublisherNames_15: + switchIcons_0: {fileID: 0} + switchIcons_1: {fileID: 0} + switchIcons_2: {fileID: 0} + switchIcons_3: {fileID: 0} + switchIcons_4: {fileID: 0} + switchIcons_5: {fileID: 0} + switchIcons_6: {fileID: 0} + switchIcons_7: {fileID: 0} + switchIcons_8: {fileID: 0} + switchIcons_9: {fileID: 0} + switchIcons_10: {fileID: 0} + switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} + switchSmallIcons_0: {fileID: 0} + switchSmallIcons_1: {fileID: 0} + switchSmallIcons_2: {fileID: 0} + switchSmallIcons_3: {fileID: 0} + switchSmallIcons_4: {fileID: 0} + switchSmallIcons_5: {fileID: 0} + switchSmallIcons_6: {fileID: 0} + switchSmallIcons_7: {fileID: 0} + switchSmallIcons_8: {fileID: 0} + switchSmallIcons_9: {fileID: 0} + switchSmallIcons_10: {fileID: 0} + switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: + switchMainThreadStackSize: 1048576 + switchPresenceGroupId: + switchLogoHandling: 0 + switchReleaseVersion: 0 + switchDisplayVersion: 1.0.0 + switchStartupUserAccount: 0 + switchSupportedLanguagesMask: 0 + switchLogoType: 0 + switchApplicationErrorCodeCategory: + switchUserAccountSaveDataSize: 0 + switchUserAccountSaveDataJournalSize: 0 + switchApplicationAttribute: 0 + switchCardSpecSize: -1 + switchCardSpecClock: -1 + switchRatingsMask: 0 + switchRatingsInt_0: 0 + switchRatingsInt_1: 0 + switchRatingsInt_2: 0 + switchRatingsInt_3: 0 + switchRatingsInt_4: 0 + switchRatingsInt_5: 0 + switchRatingsInt_6: 0 + switchRatingsInt_7: 0 + switchRatingsInt_8: 0 + switchRatingsInt_9: 0 + switchRatingsInt_10: 0 + switchRatingsInt_11: 0 + switchRatingsInt_12: 0 + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: + switchParentalControl: 0 + switchAllowsScreenshot: 1 + switchAllowsVideoCapturing: 1 + switchAllowsRuntimeAddOnContentInstall: 0 + switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 + switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 + switchSocketConfigEnabled: 0 + switchTcpInitialSendBufferSize: 32 + switchTcpInitialReceiveBufferSize: 64 + switchTcpAutoSendBufferSizeMax: 256 + switchTcpAutoReceiveBufferSizeMax: 256 + switchUdpSendBufferSize: 9 + switchUdpReceiveBufferSize: 42 + switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 + ps4NPAgeRating: 12 + ps4NPTitleSecret: + ps4NPTrophyPackPath: + ps4ParentalLevel: 11 + ps4ContentID: ED1633-NPXX51362_00-0000000000000000 + ps4Category: 0 + ps4MasterVersion: 01.00 + ps4AppVersion: 01.00 + ps4AppType: 0 + ps4ParamSfxPath: + ps4VideoOutPixelFormat: 0 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutBaseModeInitialWidth: 1920 + ps4VideoOutReprojectionRate: 60 + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: + ps4RemotePlayKeyAssignment: -1 + ps4RemotePlayKeyMappingDir: + ps4PlayTogetherPlayerCount: 0 + ps4EnterButtonAssignment: 1 + ps4ApplicationParam1: 0 + ps4ApplicationParam2: 0 + ps4ApplicationParam3: 0 + ps4ApplicationParam4: 0 + ps4DownloadDataSize: 0 + ps4GarlicHeapSize: 2048 + ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps4pnSessions: 1 + ps4pnPresence: 1 + ps4pnFriends: 1 + ps4pnGameCustomData: 1 + playerPrefsSupport: 0 + enableApplicationExit: 0 + resetTempFolder: 1 + restrictedAudioUsageRights: 0 + ps4UseResolutionFallback: 0 + ps4ReprojectionSupport: 0 + ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 + ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 0 + ps4Audio3dVirtualSpeakerCount: 14 + ps4attribCpuUsage: 0 + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 + ps4attribUserManagement: 0 + ps4attribMoveSupport: 0 + ps4attrib3DSupport: 0 + ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 + ps4disableAutoHideSplash: 0 + ps4videoRecordingFeaturesUsed: 0 + ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 + ps4attribEyeToEyeDistanceSettingVR: 0 + ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 + monoEnv: + splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 + spritePackerPolicy: + webGLMemorySize: 512 + webGLExceptionSupport: 1 + webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 + webGLDataCaching: 0 + webGLDebugSymbols: 1 + webGLEmscriptenArgs: ' --profiling-funcs -s ALLOW_MEMORY_GROWTH=1 -s ERROR_ON_UNDEFINED_SYMBOLS=0 ' + webGLModulesDirectory: + webGLTemplate: PROJECT:decentraland + webGLAnalyzeBuildSize: 1 + webGLUseEmbeddedResources: 0 + webGLCompressionFormat: 2 + webGLWasmArithmeticExceptions: 1 + 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 + Android: UNITY_POST_PROCESSING_STACK_V2 + CloudRendering: UNITY_POST_PROCESSING_STACK_V2 + EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 + GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 + Lumin: UNITY_POST_PROCESSING_STACK_V2 + 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 + tvOS: UNITY_POST_PROCESSING_STACK_V2 + additionalCompilerArguments: {} + platformArchitecture: {} + scriptingBackend: + Standalone: 0 + il2cppCompilerConfiguration: + WebGL: 2 + il2cppCodeGeneration: {} + managedStrippingLevel: {} + incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 + allowUnsafeCode: 1 + useDeterministicCompilation: 1 + additionalIl2CppArgs: ' --emit-source-mapping' + scriptingRuntimeVersion: 1 + gcIncremental: 1 + gcWBarrierValidation: 0 + apiCompatibilityLevelPerPlatform: + Standalone: 3 + WebGL: 6 + m_RenderingPath: 1 + m_MobileRenderingPath: 1 + metroPackageName: Template_3D + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: + metroCertificateNotAfter: 0000000000000000 + metroApplicationDescription: Template_3D + wsaImages: {} + metroTileShortName: + metroTileShowName: 0 + metroMediumTileShowName: 0 + metroLargeTileShowName: 0 + metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 + metroDefaultTileSize: 1 + metroTileForegroundText: 2 + metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, + a: 1} + metroSplashScreenUseBackgroundColor: 0 + platformCapabilities: {} + metroTargetDeviceFamilies: {} + metroFTAName: + metroFTAFileTypes: [] + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 + XboxOnePackageEncryption: 0 + XboxOnePackageUpdateGranularity: 2 + XboxOneDescription: + XboxOneLanguage: + - enus + XboxOneCapability: [] + XboxOneGameRating: {} + XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 + XboxOneEnableGPUVariability: 0 + XboxOneSockets: {} + XboxOneSplashScreen: {fileID: 0} + XboxOneAllowedProductIds: [] + XboxOnePersistentLocalStorageSize: 0 + XboxOneXTitleMemory: 8 + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} + cloudServicesEnabled: + UNet: 1 + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_SignPackage: 1 + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: + apiCompatibilityLevel: 6 + activeInputHandler: 0 + windowsGamepadBackendHint: 0 + cloudProjectId: + framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] + projectName: + organizationId: + cloudEnabled: 0 + legacyClampBlendShapeWeights: 0 + 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/QualitySettings.asset b/unity-renderer/ProjectSettings/QualitySettings.asset index e66a773d67..9689800b98 100644 --- a/unity-renderer/ProjectSettings/QualitySettings.asset +++ b/unity-renderer/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 0 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: Very Low pixelLightCount: 0 shadows: 0 @@ -19,16 +19,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 - antiAliasing: 8 + antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.3 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 1 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -42,7 +46,17 @@ QualitySettings: resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 11400000, guid: 4ef42bb6871b2e545b8c1a77a3bca1fb, type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: Android: 0 Standalone: 0 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