diff --git a/TestProjects/ToonURPTest-6000.0/ProjectSettings/EditorBuildSettings.asset b/TestProjects/ToonURPTest-6000.0/ProjectSettings/EditorBuildSettings.asset index f0dd1ccf9..1b7d84a77 100644 --- a/TestProjects/ToonURPTest-6000.0/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/ToonURPTest-6000.0/ProjectSettings/EditorBuildSettings.asset @@ -75,6 +75,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Fog/100_Fog.unity guid: 21d03c3cf38637648994bf343a3e92f4 + - enabled: 1 + path: Assets/Scenes/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity + guid: f3a1e85794b2adb4eb90ec33971faeca m_configObjects: com.unity.xr.management.loader_settings: {fileID: 11400000, guid: cf2afb40cc2d9db4ea3770686df52896, type: 2} diff --git a/TestProjects/ToonURPTest-6000.3/Assets/RP_Assets/ForwardRenderer.asset b/TestProjects/ToonURPTest-6000.3/Assets/RP_Assets/ForwardRenderer.asset index 7fd3338b2..8ce71d383 100644 --- a/TestProjects/ToonURPTest-6000.3/Assets/RP_Assets/ForwardRenderer.asset +++ b/TestProjects/ToonURPTest-6000.3/Assets/RP_Assets/ForwardRenderer.asset @@ -31,30 +31,17 @@ MonoBehaviour: type: 3} probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3} - m_RendererFeatures: [] - m_RendererFeatureMap: + probeVolumeBlendStatesCS: {fileID: 0} + m_RendererFeatures: + - {fileID: 2516870966013813015} + m_RendererFeatureMap: 1761bf02cfb8ed22 m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, - type: 3} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, - type: 3} - blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} - cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, - type: 3} - objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, - type: 3} - m_AssetVersion: 2 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_AssetVersion: 3 + m_PrepassLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -72,5 +59,28 @@ MonoBehaviour: m_RenderingMode: 0 m_DepthPrimingMode: 0 m_CopyDepthMode: 0 + m_DepthAttachmentFormat: 0 + m_DepthTextureFormat: 0 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 0 +--- !u!114 &2516870966013813015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1614fc811f8f184697d9bee70ab9fe5, type: 3} + m_Name: DecalRendererFeature + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.DecalRendererFeature + m_Active: 1 + m_Settings: + technique: 0 + maxDrawDistance: 1000 + decalLayers: 1 + dBufferSettings: + surfaceData: 2 + screenSpaceSettings: + normalBlend: 0 diff --git a/TestProjects/ToonURPTest-6000.3/ProjectSettings/EditorBuildSettings.asset b/TestProjects/ToonURPTest-6000.3/ProjectSettings/EditorBuildSettings.asset index eeec6b7ca..6ef6e7e79 100644 --- a/TestProjects/ToonURPTest-6000.3/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/ToonURPTest-6000.3/ProjectSettings/EditorBuildSettings.asset @@ -75,6 +75,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/BallsAndPlanesSSS/BallsAndPlanesSSS.unity guid: 263247caae47a8640a9ba4d567b0fed7 + - enabled: 1 + path: Assets/Scenes/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity + guid: f3a1e85794b2adb4eb90ec33971faeca m_configObjects: com.unity.xr.management.loader_settings: {fileID: 11400000, guid: cf2afb40cc2d9db4ea3770686df52896, type: 2} diff --git a/TestProjects/ToonURPTest-6000.6/Assets/RP_Assets/ForwardRenderer.asset b/TestProjects/ToonURPTest-6000.6/Assets/RP_Assets/ForwardRenderer.asset index 7fd3338b2..af1101f81 100644 --- a/TestProjects/ToonURPTest-6000.6/Assets/RP_Assets/ForwardRenderer.asset +++ b/TestProjects/ToonURPTest-6000.6/Assets/RP_Assets/ForwardRenderer.asset @@ -13,48 +13,26 @@ MonoBehaviour: m_Name: ForwardRenderer m_EditorClassIdentifier: debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} - probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, - type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} probeVolumeResources: - probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, - type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, - type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, - type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, - type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, - type: 3} - probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, - type: 3} - m_RendererFeatures: [] - m_RendererFeatureMap: - m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3} + probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3} + probeVolumeBlendStatesCS: {fileID: 0} + m_RendererFeatures: + - {fileID: 7748961073566421355} + m_RendererFeatureMap: 6b9141680ad7896b xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, - type: 3} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} - coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, - type: 3} - blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} - cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, - type: 3} - objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, - type: 3} - m_AssetVersion: 2 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_AssetVersion: 3 + m_PrepassLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -72,5 +50,29 @@ MonoBehaviour: m_RenderingMode: 0 m_DepthPrimingMode: 0 m_CopyDepthMode: 0 + m_DepthAttachmentFormat: 0 + m_DepthTextureFormat: 0 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 0 + m_TileOnlyMode: 0 +--- !u!114 &7748961073566421355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1614fc811f8f184697d9bee70ab9fe5, type: 3} + m_Name: DecalRendererFeature + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.DecalRendererFeature + m_Active: 1 + m_Settings: + technique: 0 + maxDrawDistance: 1000 + decalLayers: 0 + dBufferSettings: + surfaceData: 2 + screenSpaceSettings: + normalBlend: 0 diff --git a/TestProjects/ToonURPTest-6000.6/ProjectSettings/EditorBuildSettings.asset b/TestProjects/ToonURPTest-6000.6/ProjectSettings/EditorBuildSettings.asset index 40b36463c..56b477b1f 100644 --- a/TestProjects/ToonURPTest-6000.6/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/ToonURPTest-6000.6/ProjectSettings/EditorBuildSettings.asset @@ -65,15 +65,18 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/MetaverseOutlineLighting/OutlineLighting01_Skybox.unity guid: 5047ff20b5c6df041aaea05829075248 - - enabled: 1 + - enabled: 0 path: Assets/ScenesDev/BallsAndPlanes2D/BallsAndPlanes2D.unity guid: fef52238fd46cc04dbfdd02e7820de9f - - enabled: 1 + - enabled: 0 path: Assets/ScenesDev/UnityChan_3Das2D/UnityChan_3Das2D.unity guid: ad2a119f71ca2f24fb145f0499af8737 - enabled: 1 path: Assets/Scenes/BallsAndPlanesSSS/BallsAndPlanesSSS.unity guid: 263247caae47a8640a9ba4d567b0fed7 + - enabled: 1 + path: Assets/Scenes/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity + guid: f3a1e85794b2adb4eb90ec33971faeca m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: cf2afb40cc2d9db4ea3770686df52896, type: 2} diff --git a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs index efe6d208d..a7f66f8af 100644 --- a/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs +++ b/com.unity.toon-graphics-test/Runtime/UTSGraphicsTests.cs @@ -5,6 +5,7 @@ using UnityEngine.TestTools.Graphics; using UnityEngine.SceneManagement; using System.IO; +using Unity.XR.MockHMD; using UnityEditor; @@ -38,6 +39,17 @@ public IEnumerator Run(GraphicsTestCase testCase) { if (sceneFileName.EndsWith("2D")) { Assert.Ignore(); } + +#if UTS_TEST_USE_URP && UNITY_STANDALONE_OSX + + //[Note-sin: 2026-05-01] Hack to set mode in decal scenes due to "Metal: memoryless texture requires 2D texture" + MockHMDBuildSettings.RenderMode mode = MockHMDBuildSettings.RenderMode.SinglePassInstanced; + if (sceneFileName.Contains("Decal")) { + mode = MockHMDBuildSettings.RenderMode.MultiPass; + } + MockHMD.SetRenderMode(mode); + +#endif //UTS_TEST_USE_HDRP && UNITY_STANDALONE_OSX //Enable XR diff --git a/com.unity.toon-graphics-test/Runtime/Unity.ToonShader.GraphicsTest.asmdef b/com.unity.toon-graphics-test/Runtime/Unity.ToonShader.GraphicsTest.asmdef index 3a8afe25e..d6b951207 100644 --- a/com.unity.toon-graphics-test/Runtime/Unity.ToonShader.GraphicsTest.asmdef +++ b/com.unity.toon-graphics-test/Runtime/Unity.ToonShader.GraphicsTest.asmdef @@ -5,7 +5,8 @@ "GUID:c081bc530f560634bb5c21d4b323a7f1", "GUID:27619889b8ba8c24980f49ee34dbb44a", "GUID:e40ba710768534012815d3193fa296cb", - "GUID:e18141520846dcc44b725b2f74e91229" + "GUID:e18141520846dcc44b725b2f74e91229", + "GUID:344c59e53e2aa435db7f183483734523" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/MockHMDLoader/105_RenderLayerWithDecal.png b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/MockHMDLoader/105_RenderLayerWithDecal.png new file mode 100644 index 000000000..5636334d1 Binary files /dev/null and b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/MockHMDLoader/105_RenderLayerWithDecal.png differ diff --git a/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/MockHMDLoader/105_RenderLayerWithDecal.png.meta b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/MockHMDLoader/105_RenderLayerWithDecal.png.meta new file mode 100644 index 000000000..c129df752 --- /dev/null +++ b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/MockHMDLoader/105_RenderLayerWithDecal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 1abde716d5c1e074ba9e3d1a864444fb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/None/105_RenderLayerWithDecal.png b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/None/105_RenderLayerWithDecal.png new file mode 100644 index 000000000..1a7182653 Binary files /dev/null and b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/None/105_RenderLayerWithDecal.png differ diff --git a/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/None/105_RenderLayerWithDecal.png.meta b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/None/105_RenderLayerWithDecal.png.meta new file mode 100644 index 000000000..77c60278b --- /dev/null +++ b/com.unity.toon-reference-images/URP/Linear/OSXEditor_AppleSilicon/Metal/None/105_RenderLayerWithDecal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 16c46ffae12c984429f866b5c8837af5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/MockHMDLoader/105_RenderLayerWithDecal.png b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/MockHMDLoader/105_RenderLayerWithDecal.png new file mode 100644 index 000000000..5636334d1 Binary files /dev/null and b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/MockHMDLoader/105_RenderLayerWithDecal.png differ diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/MockHMDLoader/105_RenderLayerWithDecal.png.meta b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/MockHMDLoader/105_RenderLayerWithDecal.png.meta new file mode 100644 index 000000000..16c740bcd --- /dev/null +++ b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/MockHMDLoader/105_RenderLayerWithDecal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 04987c9799637034c9a95f082904418a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/None/105_RenderLayerWithDecal.png b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/None/105_RenderLayerWithDecal.png new file mode 100644 index 000000000..1a7182653 Binary files /dev/null and b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/None/105_RenderLayerWithDecal.png differ diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/None/105_RenderLayerWithDecal.png.meta b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/None/105_RenderLayerWithDecal.png.meta new file mode 100644 index 000000000..bbf41b61a --- /dev/null +++ b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Direct3D11/None/105_RenderLayerWithDecal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 5224f04e179270245a8dec9fab5be1a9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/MockHMDLoader/105_RenderLayerWithDecal.png b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/MockHMDLoader/105_RenderLayerWithDecal.png new file mode 100644 index 000000000..5636334d1 Binary files /dev/null and b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/MockHMDLoader/105_RenderLayerWithDecal.png differ diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/MockHMDLoader/105_RenderLayerWithDecal.png.meta b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/MockHMDLoader/105_RenderLayerWithDecal.png.meta new file mode 100644 index 000000000..8c4df2996 --- /dev/null +++ b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/MockHMDLoader/105_RenderLayerWithDecal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: baa5f562b4b11f0418881a0378706d71 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/None/105_RenderLayerWithDecal.png b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/None/105_RenderLayerWithDecal.png new file mode 100644 index 000000000..1a7182653 Binary files /dev/null and b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/None/105_RenderLayerWithDecal.png differ diff --git a/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/None/105_RenderLayerWithDecal.png.meta b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/None/105_RenderLayerWithDecal.png.meta new file mode 100644 index 000000000..da7a7c587 --- /dev/null +++ b/com.unity.toon-reference-images/URP/Linear/WindowsEditor/Vulkan/None/105_RenderLayerWithDecal.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 058c1e10b2daa0442be30f9123b41bec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal.meta b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal.meta similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal.meta rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal.meta diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/RenderLayerWithDecal.unity b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity similarity index 86% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/RenderLayerWithDecal.unity rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity index df63339bc..c8dfdc285 100644 --- a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/RenderLayerWithDecal.unity +++ b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity @@ -186,7 +186,7 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 2 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} @@ -210,13 +210,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} serializedVersion: 2 - m_LocalRotation: {x: 0.10938167, y: 0.8754261, z: -0.40821788, w: 0.23456976} - m_LocalPosition: {x: 0, y: 50, z: 0} + m_LocalRotation: {x: -0.14647596, y: 0.093124785, z: -0.96142626, w: 0.21338278} + m_LocalPosition: {x: 0, y: 1.401, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: 150, z: 0} + m_LocalEulerAnglesHint: {x: 6.693, y: 18.881, z: -153.859} --- !u!114 &410087042 MonoBehaviour: m_ObjectHideFlags: 0 @@ -233,7 +233,7 @@ MonoBehaviour: m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 - m_RenderingLayers: 1 + m_RenderingLayers: 2 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 m_ShadowRenderingLayers: 1 @@ -274,7 +274,7 @@ MonoBehaviour: m_FadeScale: 1 m_StartAngleFade: 180 m_EndAngleFade: 180 - m_UVScale: {x: 5, y: 5} + m_UVScale: {x: 25, y: 5} m_UVBias: {x: 0, y: 0} m_DecalLayerMask: 2 m_ScaleMode: 0 @@ -290,13 +290,13 @@ Transform: m_GameObject: {fileID: 558354327} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 1, z: 0.71} + m_LocalPosition: {x: 1.28, y: 0.66, z: 0.71} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &962490121 +--- !u!1 &916149987 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -304,70 +304,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 962490122} - - component: {fileID: 962490124} - - component: {fileID: 962490123} + - component: {fileID: 916149988} + - component: {fileID: 916149990} + - component: {fileID: 916149989} m_Layer: 0 - m_Name: New Text + m_Name: Sphere_Everything m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &962490122 +--- !u!4 &916149988 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962490121} + m_GameObject: {fileID: 916149987} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.14, y: 0.37, z: 2.38} - m_LocalScale: {x: 0.005, y: 0.005, z: 0.005} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3, y: 0, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1327728869} + m_Father: {fileID: 1589947899} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!102 &962490123 -TextMesh: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962490121} - m_Text: 'Shaders should write to RenderLayers - - even when on default. When Toon - renders - - after a Decal Receiver, artifacts appear - - because Toon is not - updating the render - - layers texture at all.' - m_OffsetZ: 0 - m_CharacterSize: 5 - m_LineSpacing: 1 - m_Anchor: 0 - m_Alignment: 0 - m_TabSize: 4 - m_FontSize: 0 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_Color: - serializedVersion: 2 - rgba: 4278190080 ---- !u!23 &962490124 +--- !u!23 &916149989 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 962490121} + m_GameObject: {fileID: 916149987} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -381,10 +349,10 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -406,6 +374,48 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &916149990 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916149987} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1090653445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1090653446} + m_Layer: 0 + m_Name: Toon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1090653446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090653445} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1928555971237407389} + - {fileID: 1928555972928499877} + - {fileID: 2080762366} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1327728865 GameObject: m_ObjectHideFlags: 0 @@ -416,10 +426,9 @@ GameObject: m_Component: - component: {fileID: 1327728869} - component: {fileID: 1327728868} - - component: {fileID: 1327728867} - component: {fileID: 1327728866} m_Layer: 0 - m_Name: CameraShowingToonArtifacts + m_Name: Camera m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -469,14 +478,6 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 ---- !u!81 &1327728867 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1327728865} - m_Enabled: 1 --- !u!20 &1327728868 Camera: m_ObjectHideFlags: 0 @@ -486,7 +487,7 @@ Camera: m_GameObject: {fileID: 1327728865} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -510,7 +511,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 26.9 + field of view: 60 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -536,14 +537,47 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1327728865} serializedVersion: 2 - m_LocalRotation: {x: 0.08653325, y: 0.19558394, z: -0.01732811, w: 0.9767081} - m_LocalPosition: {x: -2.09, y: 1.53, z: -6.83} + m_LocalRotation: {x: 0.27112332, y: -0.18997765, z: 0.05454708, w: 0.9420326} + m_LocalPosition: {x: 2.9281976, y: 1.8119015, z: -2.4825299} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 962490122} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 10.126, y: 22.647, z: 0} +--- !u!1 &1589947898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1589947899} + m_Layer: 0 + m_Name: Lit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1589947899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589947898} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.08} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1928555972803006782} + - {fileID: 1928555972106630088} + - {fileID: 916149988} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2010399324 GameObject: m_ObjectHideFlags: 0 @@ -659,19 +693,52 @@ Transform: m_GameObject: {fileID: 2010399324} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalPosition: {x: 1.54, y: 1.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &361316610771517088 +--- !u!1 &2080762365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2080762366} + - component: {fileID: 2080762368} + - component: {fileID: 2080762367} + m_Layer: 0 + m_Name: SphereToon_Everything + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2080762366 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080762365} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3, y: 0, z: -0.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1090653446} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2080762367 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472382656837511878} + m_GameObject: {fileID: 2080762365} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -685,10 +752,10 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: f620a7e623ba8c144957d10f54de9504, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -710,31 +777,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &472382656837511878 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6374271362678795732} - - component: {fileID: 1679941097903541667} - - component: {fileID: 361316610771517088} - m_Layer: 0 - m_Name: SphereDefault - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!33 &1679941097903541667 +--- !u!33 &2080762368 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472382656837511878} + m_GameObject: {fileID: 2080762365} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1928555971237407389 Transform: @@ -744,27 +793,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4915768045724544399} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.5, y: 0, z: -0.75} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1928555972001837686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4915768047006938468} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1090653446} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1928555972106630088 Transform: @@ -774,12 +808,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4915768047113827546} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.5, y: 0, z: 0.75} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.5, y: 0, z: 0.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1589947899} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1928555972803006782 Transform: @@ -789,12 +823,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4915768046214272556} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.5, y: 0, z: 0.75} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1589947899} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1928555972928499877 Transform: @@ -804,12 +838,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4915768046325118903} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.5, y: 0, z: -0.75} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.5, y: 0, z: -0.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1090653446} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4915768045724544399 GameObject: @@ -841,7 +875,7 @@ GameObject: - component: {fileID: 6189693009468420425} - component: {fileID: 5167259293685137994} m_Layer: 0 - m_Name: SphereDefault_ReceiveDecals + m_Name: Sphere_ReceiveDecals m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -865,24 +899,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &4915768047006938468 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1928555972001837686} - - component: {fileID: 6189693009212494337} - - component: {fileID: 5167259294494712066} - m_Layer: 0 - m_Name: SphereToon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &4915768047113827546 GameObject: m_ObjectHideFlags: 0 @@ -895,7 +911,7 @@ GameObject: - component: {fileID: 6189693009243362239} - component: {fileID: 5167259294395949244} m_Layer: 0 - m_Name: SphereDefault_GreenLight + m_Name: Sphere_GreenLight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -921,7 +937,7 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 - m_RenderingLayerMask: 3 + m_RenderingLayerMask: 2 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f620a7e623ba8c144957d10f54de9504, type: 2} @@ -966,7 +982,7 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 - m_RenderingLayerMask: 5 + m_RenderingLayerMask: 4 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f620a7e623ba8c144957d10f54de9504, type: 2} @@ -1011,7 +1027,7 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 - m_RenderingLayerMask: 3 + m_RenderingLayerMask: 2 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -1056,7 +1072,7 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 - m_RenderingLayerMask: 5 + m_RenderingLayerMask: 4 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -1081,51 +1097,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!23 &5167259294494712066 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4915768047006938468} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f620a7e623ba8c144957d10f54de9504, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &6189693007846214378 MeshFilter: m_ObjectHideFlags: 0 @@ -1134,14 +1105,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4915768045724544399} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &6189693009212494337 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4915768047006938468} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &6189693009243362239 MeshFilter: m_ObjectHideFlags: 0 @@ -1166,21 +1129,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4915768046325118903} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &6374271362678795732 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472382656837511878} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.75} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1188,10 +1136,6 @@ SceneRoots: - {fileID: 1327728869} - {fileID: 410087041} - {fileID: 2010399327} - - {fileID: 6374271362678795732} - - {fileID: 1928555972803006782} - - {fileID: 1928555972106630088} - - {fileID: 1928555972001837686} - - {fileID: 1928555971237407389} - - {fileID: 1928555972928499877} - {fileID: 558354329} + - {fileID: 1589947899} + - {fileID: 1090653446} diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/RenderLayerWithDecal.unity.meta b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity.meta similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/RenderLayerWithDecal.unity.meta rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/105_RenderLayerWithDecal.unity.meta diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DecalProjector.mat b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DecalProjector.mat similarity index 97% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DecalProjector.mat rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DecalProjector.mat index 7c10eb630..30243924d 100644 --- a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DecalProjector.mat +++ b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DecalProjector.mat @@ -38,7 +38,7 @@ Material: serializedVersion: 3 m_TexEnvs: - Base_Map: - m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0} + m_Texture: {fileID: 2800000, guid: 1eda71430b0d0004e8a452267cddd373, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - Normal_Map: diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DecalProjector.mat.meta b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DecalProjector.mat.meta similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DecalProjector.mat.meta rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DecalProjector.mat.meta diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DefaultVolumeProfile.asset b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DefaultVolumeProfile.asset similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DefaultVolumeProfile.asset rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DefaultVolumeProfile.asset diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DefaultVolumeProfile.asset.meta b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DefaultVolumeProfile.asset.meta similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/DefaultVolumeProfile.asset.meta rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/DefaultVolumeProfile.asset.meta diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/Toon.mat b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/Toon.mat similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/Toon.mat rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/Toon.mat diff --git a/TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/Toon.mat.meta b/com.unity.toon-scenes/URP/105_RenderLayerWithDecal/Toon.mat.meta similarity index 100% rename from TestProjects/ToonURPTest-6000.0/Assets/ScenesDev/RenderLayerWithDecal/Toon.mat.meta rename to com.unity.toon-scenes/URP/105_RenderLayerWithDecal/Toon.mat.meta