From 5cf6a2a0c2ef6a517b77e13e91c1b248fcef8092 Mon Sep 17 00:00:00 2001 From: LiRuoChen <571244399@qq.com> Date: Fri, 6 Nov 2026 18:22:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(ShaderBake):=20=E5=AE=9E=E6=97=B6=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=94=B9=E6=88=90=E7=BC=96=E8=BE=91=E5=99=A8=E5=BF=83?= =?UTF-8?q?=E8=B7=B3=EF=BC=8C=E6=B5=8B=E8=AF=95=E8=A7=86=E5=9B=BE=E8=BF=9B?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 只等控件回调是刷不出来的:数字框延迟提交、拖标签、在别处改材质、 shader 里用 _Time 挪顶点都不发 ChangeEvent,表现就是"界面不跟着刷新"。 现在「实时预览」开著时由 EditorApplication.update 按节拍重画 (聚焦 24fps、失焦 6fps),心跳那次不抢状态栏的话。 关掉时改动只记成待刷新,写在「重新渲染」按钮上。 工具栏「UV 检查」换成「测试视图 ▾」四选一,选中格铺满加进网格行, 存档设置也跟着改:开机默认关,排查视图不该下次打开还挡着真实结果。 --- Editor/ShaderBake/BakeShaderAsImageWindow.cs | 467 +++++++++++++------ Editor/ShaderBake/BakeShaderWindow.uxml | 11 +- 2 files changed, 324 insertions(+), 154 deletions(-) diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs index a2280b6..e38f530 100644 --- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs +++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs @@ -27,17 +27,21 @@ 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 kDebugViewShaderPath = "Packages/com.lrss3.xericuiactionvessel/Editor/ShaderBake/ShaderBakeDebugView.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 kPrefDebugView = "XericUI.ShaderBake.DebugView"; 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"; + /// 测试视图用的那张 shader(Editor 目录下,见 ShaderBakeDebugView.shader) + private const string kDebugViewShader = "Hidden/XericUI/ShaderBake/Debug View"; + + /// 实时预览的节拍:有焦点时跟上动画,失焦时放慢,不让一张没人看的图占着 GPU + private const double kLiveIntervalFocused = 1.0 / 24.0; + private const double kLiveIntervalBlurred = 1.0 / 6.0; private const float kDefaultDetailWidth = 340f; private static readonly string[] kAntiAliasingChoices = { "1", "2", "4", "8" }; @@ -61,9 +65,10 @@ namespace XericUI.ShaderBake.Editor private ObjectField m_MaterialField; private Label m_SourceNote; private Button m_ExportButton; + private ToolbarButton m_RenderButton; private ToolbarToggle m_AutoRefreshToggle; private ToolbarToggle m_CheckerToggle; - private ToolbarToggle m_UvCheckToggle; + private ToolbarButton m_DebugButton; private Label m_StatusMessage; private Label m_StatusSize; private Label m_StatusTime; @@ -74,13 +79,37 @@ namespace XericUI.ShaderBake.Editor private readonly List m_Syncers = new List(); private bool m_RenderPending; + /// 实时预览关着时攒下的改动:还没重画,「重新渲染」按钮上会写着这件事 + private bool m_PendingRefresh; private double m_LastRenderMs = -1; + private double m_NextLiveRender; /// 上一次结果的不透明像素占比,-1 = 没测出来 private float m_LastCoverage = -1f; - /// 探针(自检 / UV 检查)活着才能让那张图继续显示;下一次正常渲染时收掉 + /// 探针(自检 / 测试视图)活着才能让那张图继续显示;切回真实结果时才收掉 private readonly ShaderBakeOverrideRenderer m_Override = new ShaderBakeOverrideRenderer(); + private DebugView m_DebugView = DebugView.None; + /// 测试视图那张材质:_Mode 决定画哪种图,建一次反复用 + private Material m_DebugMaterial; private int m_SelectedFace; + /// 预览换成"量几何与 UV"的测试图。都不吃贴图、不吃光照,画不出来的原因只剩一个。 + /// Uv/Gradient/Checker 的取值与 shader 的 _Mode 一一对应 + private enum DebugView + { + None = -1, + /// 红=U、绿=V,一格四角即 00/10/01/11 + Uv = 0, + /// 灰度尺:主体沿 U、顶条沿 V,每 0.1 一档,量这一格跨了多少像素 + Gradient = 1, + /// 半 UV 棋盘 + 每格色相 + 左下角红/右上角蓝,看拉伸、斜切与镜像 + Checker = 2, + /// + /// 内置 Unlit/Color 的一张绿面片:不吃贴图、不吃光照、不吃 UV,只回答"这套矩阵画得出东西吗"。 + /// 取值故意离开 shader 的 _Mode 范围——它用的是另一张 shader + /// + SolidColor = 20 + } + [MenuItem(XericRegistrationPaths.ToolBar + "/Bake Shader As Image", false, 20)] private static void OpenFromMenu() { @@ -136,10 +165,33 @@ namespace XericUI.ShaderBake.Editor AdoptSelectionIfEmpty(); AssignSource(m_Source.sourceShader, m_Source.sourceMaterial, true); DoRender(); + + // 实时预览的节拍由这里驱动,域重载/关窗口时在 OnDisable 里摘掉 + EditorApplication.update -= OnEditorUpdate; + EditorApplication.update += OnEditorUpdate; + } + + /// + /// 编辑器心跳:实时预览开着就按固定节拍重画,不管有没有"改动事件"。 + /// + /// 之所以不能只等控件回调:数字框是延迟提交的,拖标签刻度、在别处改材质、 + /// shader 里用 _Time 挪顶点,这些都不会发 ChangeEvent——表现就是"界面不跟着刷新"。 + /// 关掉实时预览时这里什么都不做,改动只标记成待刷新。 + /// + private void OnEditorUpdate() + { + if (m_Renderer == null || m_Preview == null || m_AutoRefreshToggle == null || !m_AutoRefreshToggle.value) + return; + double now = EditorApplication.timeSinceStartup; + if (now < m_NextLiveRender) + return; + m_NextLiveRender = now + (hasFocus ? kLiveIntervalFocused : kLiveIntervalBlurred); + DoRender(true); } private void OnDisable() { + EditorApplication.update -= OnEditorUpdate; SavePrefs(); if (m_Exporter != null) m_Exporter.settingsReplaced -= OnSettingsReplaced; @@ -147,9 +199,9 @@ namespace XericUI.ShaderBake.Editor m_PropertyTable.Dispose(); if (m_Preview != null) m_Preview.Dispose(); - // 探针那张 RT 归探针所有,先收探针 + // 探针那张 RT 归探针所有,先收探针;测试视图材质挂着 shader,不销毁就是每次开关窗口漏一份 m_Override.Release(); - // 临时材质一定要还:它挂着的是 shader,不销毁就是每次开关窗口漏一份 + ReleaseDebugMaterial(); if (m_Source != null) m_Source.Dispose(true); if (m_Renderer != null) m_Renderer.Dispose(true); m_Source = null; @@ -183,7 +235,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_DebugButton = Require("debug-view"); m_StatusMessage = Require