diff --git a/Samples~/Example1/MaskPreview.mat b/Samples~/Example1/MaskPreview.mat index 50ae594..11db56d 100644 --- a/Samples~/Example1/MaskPreview.mat +++ b/Samples~/Example1/MaskPreview.mat @@ -24,7 +24,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Mask: - m_Texture: {fileID: 8400000, guid: 6dbf8770b857bc143a3ebf8ac17ff43a, type: 2} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -42,5 +42,5 @@ Material: m_Floats: - Vector1_ed1af1f0df9f44de9360093f2e760ee8: 0.05 m_Colors: - - _MaskData: {r: 0.0048828125, g: 0.0048828125, b: 10, a: 0} + - _MaskData: {r: 0.041450195, g: 0.041450195, b: 84.89, a: 0} m_BuildTextureStacks: [] diff --git a/Samples~/Example1/MaskPreview.shadergraph b/Samples~/Example1/MaskPreview.shadergraph index 33c7c1c..95db47f 100644 --- a/Samples~/Example1/MaskPreview.shadergraph +++ b/Samples~/Example1/MaskPreview.shadergraph @@ -302,8 +302,8 @@ }, "m_Name": "Mask", "m_DefaultReferenceName": "Texture2D_101c948f7c824215ac4c982b9afc46db", - "m_OverrideReferenceName": "_Mask", - "m_GeneratePropertyBlock": true, + "m_OverrideReferenceName": "_TAO_Mask", + "m_GeneratePropertyBlock": false, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -987,8 +987,8 @@ }, "m_Name": "MaskData", "m_DefaultReferenceName": "Vector4_ccd05aab90d343e4a9ba7761cfddbf1d", - "m_OverrideReferenceName": "_MaskData", - "m_GeneratePropertyBlock": true, + "m_OverrideReferenceName": "_TAO_MaskData", + "m_GeneratePropertyBlock": false, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, diff --git a/Samples~/Example1/Prefabs/MaskRenderer.prefab b/Samples~/Example1/Prefabs/MaskRenderer.prefab index 9dd04b8..af0f57b 100644 --- a/Samples~/Example1/Prefabs/MaskRenderer.prefab +++ b/Samples~/Example1/Prefabs/MaskRenderer.prefab @@ -47,9 +47,11 @@ MonoBehaviour: m_EditorClassIdentifier: mode: 0 maskCamera: {fileID: 354132074141824159} - target: {fileID: 8400000, guid: 6dbf8770b857bc143a3ebf8ac17ff43a, type: 2} + resolution: 512 + format: 7 materials: - {fileID: 2100000, guid: 09e65b1866e39d74488b8a13aa9e21a7, type: 2} + debugGui: 1 --- !u!114 &354132074049328697 MonoBehaviour: m_ObjectHideFlags: 0 @@ -64,17 +66,26 @@ MonoBehaviour: m_EditorClassIdentifier: clearBlit: {fileID: 4800000, guid: 612652bd41e196b408fe733989b1d223, type: 3} source: {fileID: 0} - target: {fileID: 8400000, guid: 6dbf8770b857bc143a3ebf8ac17ff43a, type: 2} + target: {fileID: 0} layers: - - type: 0 + - enabled: 1 + type: 0 mask: r: 1 - g: 1 + g: 0 b: 1 a: 1 blit: {fileID: 4800000, guid: b56b79d9c9a85fb45bf1a263d73bd938, type: 3} persistentBlit: {fileID: 4800000, guid: 794c349d1ba10d34c86b6dd5c2b8bb7e, type: 3} - debugGui: 1 + - enabled: 1 + type: 1 + mask: + r: 0 + g: 1 + b: 0 + a: 0 + blit: {fileID: 4800000, guid: b56b79d9c9a85fb45bf1a263d73bd938, type: 3} + persistentBlit: {fileID: 4800000, guid: 794c349d1ba10d34c86b6dd5c2b8bb7e, type: 3} --- !u!1 &354132074141824156 GameObject: m_ObjectHideFlags: 0 diff --git a/Samples~/Example1/Sample.unity b/Samples~/Example1/Sample.unity index 7ec77cf..2dc2e14 100644 --- a/Samples~/Example1/Sample.unity +++ b/Samples~/Example1/Sample.unity @@ -98613,6 +98613,10 @@ PrefabInstance: propertyPath: m_Name value: MaskRenderer objectReference: {fileID: 0} + - target: {fileID: 354132074049328697, guid: 16a45af4d26459143a161c4f419e17b3, type: 3} + propertyPath: target + value: + objectReference: {fileID: 8400000, guid: 6dbf8770b857bc143a3ebf8ac17ff43a, type: 2} - target: {fileID: 354132074049328699, guid: 16a45af4d26459143a161c4f419e17b3, type: 3} propertyPath: m_RootOrder value: 2 diff --git a/Samples~/Example1/Textures/Target.renderTexture b/Samples~/Example1/Textures/Target.renderTexture deleted file mode 100644 index 3428abd..0000000 --- a/Samples~/Example1/Textures/Target.renderTexture +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Target - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_IsAlphaChannelOptional: 0 - serializedVersion: 3 - m_Width: 1024 - m_Height: 1024 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 0 - m_ColorFormat: 8 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Samples~/Example1/Textures/Target.renderTexture.meta b/Samples~/Example1/Textures/Target.renderTexture.meta deleted file mode 100644 index bbd5ad2..0000000 --- a/Samples~/Example1/Textures/Target.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6dbf8770b857bc143a3ebf8ac17ff43a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: - assetBundleVariant: