diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png index 53e2819eafd..d3fa7fad75c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff4f95b5eb7b67ad26973601c0ec1bfc62367bd373a7befd074307a031fc1ec9 -size 836198 +oid sha256:e8a0631947bb36f7cfcbbd1004ae00ab3ce4fc11e38280f7c194cf0400858dd5 +size 1296480 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png index 7bcb989c0de..d3fa7fad75c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2f983c91242adbba6f7f022b912942b7aa41405118befb3f44828337fb662df -size 1240812 +oid sha256:e8a0631947bb36f7cfcbbd1004ae00ab3ce4fc11e38280f7c194cf0400858dd5 +size 1296480 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png index 854e12bd338..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e7bfe140258aa69da62b6213fe589e649bc1e877b3740877681c3b3631d4589 -size 1234723 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png index 6f61c3800a1..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png index 9b8c73f1a5d..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b486a92a5aaf0c0c36eeaf664db706c25074e270504f92d20a6aee1574fecc07 -size 1286588 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png index b673d9f00df..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bb04b9a74e89246e7cf7771d3e9e66b6175aba4747dfc65eca1c00f34521dc3 -size 1290151 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png index 6f61c3800a1..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png index 6f61c3800a1..6d5152446bf 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:7c31f0f4f455c9b1c72a31ad8843c67ac2c5811afddf502add3f8ed3e371bce4 +size 1327966 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png index 7b061c2ae45..80f0975494a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:906691a7a80465740d21fb3c261b03fa80b83ac509c759dabf8b6f3bbc3cd21b -size 1285987 +oid sha256:d96c224737ac305b73dc67b234be3554026276c1ff1f7cf354c10850c012e3d0 +size 1504847 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta index 566cfaadeb1..f2d7831b1d0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 6c328d0e2b56e5c448acb1b11e2d288a +guid: e586516144439174596721855c6a1a7b TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + flipGreenChannel: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,7 +40,7 @@ TextureImporter: wrapU: 0 wrapV: 0 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -62,13 +64,14 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -91,7 +94,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png index 6f61c3800a1..c06fe1c583a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:febf291dc3116fd42e777743148d2c67a604bec8d6a2d95237243a945a4fcf4c +size 1329902 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png index 6f61c3800a1..06a39aa5f07 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:5e002d53916c231a05d24744abbfd8868e3415af122c96dc48de71fe527c2757 +size 1329918 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png index f4d0474e594..80f0975494a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21458a3772a04f90e90524bf43b040daaeff82f6786b785ffc823e6c8f9d1c4 -size 1288916 +oid sha256:d96c224737ac305b73dc67b234be3554026276c1ff1f7cf354c10850c012e3d0 +size 1504847 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta index e96ec93bad3..1554c08df46 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -91,7 +94,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta index b63a3a2e7e4..01ebaff7766 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -52,7 +53,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -75,6 +76,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index d988de57180..1275f3517f1 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fix for rendering thumbnails. [case 1348209](https://issuetracker.unity3d.com/issues/preview-of-assets-do-not-show-in-the-project-window) - Fixed a regression bug where XR camera postion can not be modified in beginCameraRendering [case 1365000] - Fixed an issue in where installing the Adaptive Performance package caused errors to the inspector UI [1368161](https://issuetracker.unity3d.com/issues/urp-package-throws-compilation-error-cs1525-when-imported-together-with-adaptive-performance-package) +- Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties) +- Fixed decals to work with render scale [1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings) - Fixed a regression where filtering the scene view yielded incorrect visual results [1360233](https://issuetracker.unity3d.com/product/unity/issues/guid/1360233) - Fixed disabled debug lighting modes on Vulkan and OpenGL following a shader compiler fix. [case 1334240] - Fixed an issue in where the Convert Renderering Settings would cause a freeze. [case 1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings) diff --git a/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs b/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs index 1f7e3d0e02f..cbb86b1a5be 100644 --- a/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs @@ -24,12 +24,17 @@ internal class DBufferRenderPass : ScriptableRenderPass private int m_DBufferCount; private ProfilingSampler m_ProfilingSampler; + private RenderTargetHandle m_DBufferDepth; + private RenderTargetHandle m_CameraDepthTexture; + private RenderTargetHandle m_CameraDepthAttachment; + internal DeferredLights deferredLights { get; set; } private bool isDeferred => deferredLights != null; internal RenderTargetIdentifier[] dBufferColorIndentifiers { get; private set; } - internal RenderTargetIdentifier dBufferDepthIndentifier { get; private set; } - internal RenderTargetIdentifier cameraDepthTextureIndentifier { get; private set; } - internal RenderTargetIdentifier cameraDepthAttachmentIndentifier { get; private set; } + + internal RenderTargetHandle dBufferDepth => m_DBufferDepth; + internal RenderTargetHandle cameraDepthTexture => m_CameraDepthTexture; + internal RenderTargetHandle cameraDepthAttachment => m_CameraDepthAttachment; public DBufferRenderPass(Material dBufferClear, DBufferSettings settings, DecalDrawDBufferSystem drawSystem) { @@ -51,9 +56,9 @@ public DBufferRenderPass(Material dBufferClear, DBufferSettings settings, DecalD dBufferColorIndentifiers[dbufferIndex] = new RenderTargetIdentifier(s_DBufferNames[dbufferIndex]); m_DBufferCount = dBufferCount; - dBufferDepthIndentifier = new RenderTargetIdentifier(s_DBufferDepthName); - cameraDepthTextureIndentifier = new RenderTargetIdentifier("_CameraDepthTexture"); - cameraDepthAttachmentIndentifier = new RenderTargetIdentifier("_CameraDepthAttachment"); + m_DBufferDepth.Init(s_DBufferDepthName); + m_CameraDepthTexture.Init("_CameraDepthTexture"); + m_CameraDepthAttachment.Init("_CameraDepthAttachment"); } public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) @@ -97,12 +102,12 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin depthDesc.depthStencilFormat = renderingData.cameraData.cameraTargetDescriptor.depthStencilFormat; depthDesc.msaaSamples = 1; - cmd.GetTemporaryRT(Shader.PropertyToID(s_DBufferDepthName), depthDesc); - depthIdentifier = dBufferDepthIndentifier; + cmd.GetTemporaryRT(m_DBufferDepth.id, depthDesc); + depthIdentifier = m_DBufferDepth.Identifier(); } else { - depthIdentifier = deferredLights.DepthAttachmentIdentifier; + depthIdentifier = m_CameraDepthAttachment.Identifier(); } ConfigureTarget(dBufferColorIndentifiers, depthIdentifier); @@ -184,7 +189,7 @@ public override void OnCameraCleanup(CommandBuffer cmd) } if (!isDeferred) - cmd.ReleaseTemporaryRT(Shader.PropertyToID(s_DBufferDepthName)); + cmd.ReleaseTemporaryRT(m_DBufferDepth.id); } } } diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs index 8d2ac09d780..9f94e9381bb 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs @@ -341,7 +341,6 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData m_ScreenSpaceSettings = GetScreenSpaceSettings(); m_CopyDepthMaterial = CoreUtils.CreateEngineMaterial(m_CopyDepthPS); - m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingPrePasses, m_CopyDepthMaterial); m_DBufferClearMaterial = CoreUtils.CreateEngineMaterial(m_DBufferClear); @@ -371,7 +370,6 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData switch (m_Technique) { case DecalTechnique.ScreenSpace: - m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingOpaques, m_DBufferClearMaterial); m_DecalDrawScreenSpaceSystem = new DecalDrawScreenSpaceSystem(m_DecalEntityManager); m_ScreenSpaceDecalRenderPass = new DecalScreenSpaceRenderPass(m_ScreenSpaceSettings, intermediateRendering ? m_DecalDrawScreenSpaceSystem : null); break; @@ -380,12 +378,12 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData m_DeferredLights = universalRenderer.deferredLights; - m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingOpaques, m_DBufferClearMaterial); m_DrawGBufferSystem = new DecalDrawGBufferSystem(m_DecalEntityManager); m_GBufferRenderPass = new DecalGBufferRenderPass(m_ScreenSpaceSettings, intermediateRendering ? m_DrawGBufferSystem : null); break; case DecalTechnique.DBuffer: + m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingPrePasses, m_CopyDepthMaterial); m_DecalDrawDBufferSystem = new DecalDrawDBufferSystem(m_DecalEntityManager); m_DBufferRenderPass = new DBufferRenderPass(m_DBufferClearMaterial, m_DBufferSettings, m_DecalDrawDBufferSystem); @@ -471,15 +469,17 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD if (universalRenderer.actualRenderingMode == RenderingMode.Deferred) { m_CopyDepthPass.Setup( - new RenderTargetHandle(m_DBufferRenderPass.cameraDepthAttachmentIndentifier), - new RenderTargetHandle(m_DBufferRenderPass.cameraDepthTextureIndentifier) + m_DBufferRenderPass.cameraDepthAttachment, + m_DBufferRenderPass.cameraDepthTexture ); + + m_CopyDepthPass.AllocateRT = false; } else { m_CopyDepthPass.Setup( - new RenderTargetHandle(m_DBufferRenderPass.cameraDepthTextureIndentifier), - new RenderTargetHandle(m_DBufferRenderPass.dBufferDepthIndentifier) + m_DBufferRenderPass.cameraDepthTexture, + m_DBufferRenderPass.dBufferDepth ); m_CopyDepthPass.CopyToDepth = true; diff --git a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs index a95dcb4bd33..c2d573d7713 100644 --- a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs @@ -218,7 +218,7 @@ void SetPerCameraShaderVariables(CommandBuffer cmd, ref CameraData cameraData) cmd.SetGlobalVector(ShaderPropertyId.zBufferParams, zBufferParams); cmd.SetGlobalVector(ShaderPropertyId.orthoParams, orthoParams); - cmd.SetGlobalVector(ShaderPropertyId.screenSize, new Vector4(cameraWidth, cameraHeight, 1.0f / cameraWidth, 1.0f / cameraHeight)); + cmd.SetGlobalVector(ShaderPropertyId.screenSize, new Vector4(scaledCameraWidth, scaledCameraHeight, 1.0f / scaledCameraWidth, 1.0f / scaledCameraHeight)); } /// diff --git a/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph b/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph index dc29db12650..89763d3ace9 100644 --- a/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph +++ b/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph @@ -34,31 +34,31 @@ "m_Id": "a6fc5c3eaf9d4c969be6a69fade9c1a1" }, { - "m_Id": "92a584d0cf0b4005b700ae91558fc595" + "m_Id": "7388a7ddbf6648ec92c3bb54ed055048" }, { - "m_Id": "e2ddf05db7b64f159f1df217b36d871d" + "m_Id": "9f1059a7a93a46ccab349515214f3ed2" }, { - "m_Id": "72199437cb87418283ba9bc457a6dc50" + "m_Id": "1300b7cb738f4b18927411750039acd2" }, { - "m_Id": "1a1a5dd064104aada905b7372694e456" + "m_Id": "360e6833e8d64d75827ab98987b2b545" }, { - "m_Id": "7388a7ddbf6648ec92c3bb54ed055048" + "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" }, { - "m_Id": "9f1059a7a93a46ccab349515214f3ed2" + "m_Id": "86a3eb218544413fb0fe50b275affa91" }, { - "m_Id": "1300b7cb738f4b18927411750039acd2" + "m_Id": "5c44c94deda840389e36349ee92db7ea" }, { - "m_Id": "360e6833e8d64d75827ab98987b2b545" + "m_Id": "2413c9d67fba4ee19cec634df799a0f9" }, { - "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" + "m_Id": "009bf2a731304616a3bbcad7d7d2153c" } ], "m_GroupDatas": [], @@ -115,7 +115,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f7cbdde7910e4ccda1328a49cd313b32" + "m_Id": "86a3eb218544413fb0fe50b275affa91" }, "m_SlotId": 0 } @@ -123,9 +123,23 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" + "m_Id": "7388a7ddbf6648ec92c3bb54ed055048" + }, + "m_SlotId": 7 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f7cbdde7910e4ccda1328a49cd313b32" }, "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "86a3eb218544413fb0fe50b275affa91" + }, + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { @@ -134,6 +148,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "86a3eb218544413fb0fe50b275affa91" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -154,7 +182,17 @@ "x": 0.0, "y": 0.0 }, - "m_Blocks": [] + "m_Blocks": [ + { + "m_Id": "5c44c94deda840389e36349ee92db7ea" + }, + { + "m_Id": "2413c9d67fba4ee19cec634df799a0f9" + }, + { + "m_Id": "009bf2a731304616a3bbcad7d7d2153c" + } + ] }, "m_FragmentContext": { "m_Position": { @@ -173,18 +211,6 @@ }, { "m_Id": "a6fc5c3eaf9d4c969be6a69fade9c1a1" - }, - { - "m_Id": "92a584d0cf0b4005b700ae91558fc595" - }, - { - "m_Id": "e2ddf05db7b64f159f1df217b36d871d" - }, - { - "m_Id": "72199437cb87418283ba9bc457a6dc50" - }, - { - "m_Id": "1a1a5dd064104aada905b7372694e456" } ] }, @@ -192,7 +218,8 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Shader Graphs", "m_GraphPrecision": 1, @@ -207,6 +234,63 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "009bf2a731304616a3bbcad7d7d2153c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "09d140abcb0a4aeeab2a87dcf46270a8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "09d140abcb0a4aeeab2a87dcf46270a8", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -236,6 +320,54 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "0aa332efc109427fb4241dc37ceac3c1", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -329,9 +461,9 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_TextureType": 0, + "m_TextureType": 1, "m_NormalMapSpace": 0, - "m_DisableGlobalMipBias": false + "m_EnableGlobalMipBias": true } { @@ -375,11 +507,11 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "1a1a5dd064104aada905b7372694e456", + "m_ObjectId": "2413c9d67fba4ee19cec634df799a0f9", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.MAOSAlpha", + "m_Name": "VertexDescription.Normal", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -392,7 +524,7 @@ }, "m_Slots": [ { - "m_Id": "29d2ab94680f4f7b8c0c7213fa03e25e" + "m_Id": "3a4e57dcc89147529d49da145c2cf89f" } ], "synonyms": [], @@ -402,37 +534,7 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.MAOSAlpha" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "2645890f46784786b0a8402519a73a9b", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Smoothness", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "29d2ab94680f4f7b8c0c7213fa03e25e", - "m_Id": 0, - "m_DisplayName": "MAOS Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "MAOSAlpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] + "m_SerializedDescriptor": "VertexDescription.Normal" } { @@ -513,6 +615,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "33b9bc54284a42a891a7a8549946f919", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -561,6 +687,30 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "3a4e57dcc89147529d49da145c2cf89f", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -647,6 +797,39 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5c44c94deda840389e36349ee92db7ea", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "33b9bc54284a42a891a7a8549946f919" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -662,21 +845,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "5f6cdb7cfacb4ad8a147d81a33c384e9", - "m_Id": 0, - "m_DisplayName": "Ambient Occlusion", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Occlusion", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -693,7 +861,56 @@ "m_AlphaClip": false, "m_CastShadows": true, "m_ReceiveShadows": true, - "m_CustomEditorGUI": "" + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "603878f203a14c6ab96789f762db855d", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } } { @@ -751,21 +968,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "66a1294041d244b89724b6fcb7fe2861", - "m_Id": 0, - "m_DisplayName": "Metallic", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Metallic", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -803,39 +1005,6 @@ "m_Channel": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "72199437cb87418283ba9bc457a6dc50", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Smoothness", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "2645890f46784786b0a8402519a73a9b" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Smoothness" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -889,7 +1058,7 @@ }, "m_TextureType": 0, "m_NormalMapSpace": 0, - "m_DisableGlobalMipBias": false + "m_EnableGlobalMipBias": true } { @@ -907,7 +1076,7 @@ "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, - "m_DefaultType": 0 + "m_DefaultType": 3 } { @@ -936,75 +1105,82 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8939b04c72d84f60bccf2b92303263a8", - "m_Id": 0, - "m_DisplayName": "Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Alpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "91d01e73dcf34e7d96a9e731fb50e308", + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "86a3eb218544413fb0fe50b275affa91", "m_Group": { "m_Id": "" }, - "m_Name": "Property", + "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -310.4757995605469, - "y": 768.4763793945313, - "width": 0.0, - "height": 0.0 + "x": -144.40000915527345, + "y": 509.199951171875, + "width": 125.60000610351563, + "height": 118.0 } }, "m_Slots": [ { - "m_Id": "a712e2b34f9e410da027e4db3100c57a" + "m_Id": "0aa332efc109427fb4241dc37ceac3c1" + }, + { + "m_Id": "b78ccfe8888c45e18b1f721cf532f926" + }, + { + "m_Id": "603878f203a14c6ab96789f762db855d" } ], - "synonyms": [], + "synonyms": [ + "multiplication", + "times", + "x" + ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "0cff3d33c0704eb597988232e81f81de" } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "92a584d0cf0b4005b700ae91558fc595", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8939b04c72d84f60bccf2b92303263a8", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "91d01e73dcf34e7d96a9e731fb50e308", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.Metallic", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -317.1999816894531, + "y": 743.9999389648438, + "width": 145.19998168945313, + "height": 34.0 } }, "m_Slots": [ { - "m_Id": "66a1294041d244b89724b6fcb7fe2861" + "m_Id": "a712e2b34f9e410da027e4db3100c57a" } ], "synonyms": [], @@ -1014,7 +1190,9 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.Metallic" + "m_Property": { + "m_Id": "0cff3d33c0704eb597988232e81f81de" + } } { @@ -1160,6 +1338,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "b78ccfe8888c45e18b1f721cf532f926", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1221,39 +1447,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "e2ddf05db7b64f159f1df217b36d871d", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Occlusion", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "5f6cdb7cfacb4ad8a147d81a33c384e9" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode",