diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs index 960b1a0..a2280b6 100644 --- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs +++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs @@ -27,13 +27,18 @@ namespace XericUI.ShaderBake.Editor private const string kUssPath = "Packages/com.lrss3.xericuiactionvessel/Editor/ShaderBake/BakeShaderWindow.uss"; private const string kRowUxmlPath = "Packages/com.lrss3.xericuiactionvessel/Editor/ShaderBake/BakeShaderPropertyRow.uxml"; private const string kGlobalRowUxmlPath = "Packages/com.lrss3.xericuiactionvessel/Editor/ShaderBake/BakeShaderGlobalRow.uxml"; + private const string kUvDebugShaderPath = "Packages/com.lrss3.xericuiactionvessel/Editor/ShaderBake/ShaderBakeUVDebug.shader"; private const string kPrefSettings = "XericUI.ShaderBake.Settings"; private const string kPrefAutoRefresh = "XericUI.ShaderBake.AutoRefresh"; private const string kPrefChecker = "XericUI.ShaderBake.Checker"; + private const string kPrefUvCheck = "XericUI.ShaderBake.UvCheck"; private const string kPrefDetailWidth = "XericUI.ShaderBake.DetailWidth"; private const string kPrefSource = "XericUI.ShaderBake.SourceAsset"; + /// UV 检查视图用的那张调试 shader(Editor 目录下,见 ShaderBakeUVDebug.shader) + private const string kUvDebugShader = "Hidden/XericUI/ShaderBake/UV Debug"; + private const float kDefaultDetailWidth = 340f; private static readonly string[] kAntiAliasingChoices = { "1", "2", "4", "8" }; private const string kCustomSize = "自定义"; @@ -58,6 +63,7 @@ namespace XericUI.ShaderBake.Editor private Button m_ExportButton; private ToolbarToggle m_AutoRefreshToggle; private ToolbarToggle m_CheckerToggle; + private ToolbarToggle m_UvCheckToggle; private Label m_StatusMessage; private Label m_StatusSize; private Label m_StatusTime; @@ -71,10 +77,8 @@ namespace XericUI.ShaderBake.Editor private double m_LastRenderMs = -1; /// 上一次结果的不透明像素占比,-1 = 没测出来 private float m_LastCoverage = -1f; - /// 管线自检的探针(活着才能让自检那张图继续显示) - private ShaderBakeRenderer m_SelfTestProbe; - private RenderTexture m_SelfTestTarget; - private Material m_SelfTestMaterial; + /// 探针(自检 / UV 检查)活着才能让那张图继续显示;下一次正常渲染时收掉 + private readonly ShaderBakeOverrideRenderer m_Override = new ShaderBakeOverrideRenderer(); private int m_SelectedFace; [MenuItem(XericRegistrationPaths.ToolBar + "/Bake Shader As Image", false, 20)] @@ -143,8 +147,9 @@ namespace XericUI.ShaderBake.Editor m_PropertyTable.Dispose(); if (m_Preview != null) m_Preview.Dispose(); + // 探针那张 RT 归探针所有,先收探针 + m_Override.Release(); // 临时材质一定要还:它挂着的是 shader,不销毁就是每次开关窗口漏一份 - ReleaseSelfTestTarget(); if (m_Source != null) m_Source.Dispose(true); if (m_Renderer != null) m_Renderer.Dispose(true); m_Source = null; @@ -178,6 +183,7 @@ namespace XericUI.ShaderBake.Editor m_ExportButton = Require("export-menu"); m_AutoRefreshToggle = Require("auto-refresh"); m_CheckerToggle = Require("show-checker"); + m_UvCheckToggle = Require("uv-check"); m_StatusMessage = Require