From 90bdbb14dfa2f9def93a5e7caa230cd78db9c5cd Mon Sep 17 00:00:00 2001 From: LiRuoChen <571244399@qq.com> Date: Sat, 7 Nov 2026 09:45:24 +0800 Subject: [PATCH] =?UTF-8?q?style(ShaderBake):=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8F=E4=B8=8E=E9=A2=84=E8=A7=88=E8=AF=BB?= =?UTF-8?q?=E6=95=B0=E9=87=8C=E7=9A=84=E8=A6=86=E7=9B=96=E7=8E=87=E6=92=AD?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 画没画满看图就知道,"画面被面片盖住 100%""不透明 100%"这类数字只是噪音。 覆盖率照测,但只写进 Debug.Log(百分比变化时才写一行),排查时从 Console 或 Editor.log 里翻;界面只留尺寸、缩放、耗时这些看图时真需要的读数。 顺带精简几条操作提示:参数已改 / 已铺满 / 外部网格不分格 / 已加入预设。 --- Editor/ShaderBake/BakeShaderAsImageWindow.cs | 61 +++++++------------- Editor/ShaderBake/BakeShaderWindow.uss | 3 +- Editor/ShaderBake/ShaderBakePreviewPane.cs | 39 +------------ 3 files changed, 23 insertions(+), 80 deletions(-) diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs index e774819..3128d4a 100644 --- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs +++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs @@ -99,6 +99,8 @@ namespace XericUI.ShaderBake.Editor private double m_NextCoverageCheck; /// 上一次结果的不透明像素占比,-1 = 没测出来 private float m_LastCoverage = -1f; + /// 上一次写进日志的覆盖率百分比:只在变化时输出,避免拖滑块刷屏 + private int m_LoggedCoverage = -1; /// 探针(自检 / 测试视图)活着才能让那张图继续显示;切回真实结果时才收掉 private readonly ShaderBakeOverrideRenderer m_Override = new ShaderBakeOverrideRenderer(); private DebugView m_DebugView = DebugView.None; @@ -530,7 +532,7 @@ namespace XericUI.ShaderBake.Editor { note.text = m_Source.shader == null ? "未指定 shader" - : (m_PropertyTable.rowCount + " 项可编辑属性(隐藏属性不列出)"); + : (m_PropertyTable.rowCount + " 项属性"); if (!string.IsNullOrEmpty(textureHint)) note.text += "\n" + textureHint; } @@ -590,7 +592,7 @@ namespace XericUI.ShaderBake.Editor { m_Renderer.settings.globals.AddEnvironmentPresets(); RefreshGlobals(); - SetStatus("已加入常用光照/环境预设(勾选才生效)"); + SetStatus("已加入预设"); } // ── 输出 ──────────────────────────────────────────────── @@ -998,11 +1000,11 @@ namespace XericUI.ShaderBake.Editor { if (!m_Renderer.FitCameraOnFace(m_SelectedFace)) { - SetStatus("选中格铺满不可用:外部网格模式下不分格"); + SetStatus("外部网格不分格"); return; } Commit(); - SetStatus("第 " + (m_SelectedFace + 1) + " 格已铺满画面,仍有留白就按「匹配面片比例」"); + SetStatus("第 " + (m_SelectedFace + 1) + " 格已铺满"); } /// @@ -1036,7 +1038,7 @@ namespace XericUI.ShaderBake.Editor SetStatus("管线自检:空画面"); return; } - SetSelfTestNote("自检通过:覆盖 " + Mathf.RoundToInt(m_LastCoverage * 100f) + "%"); + SetSelfTestNote("自检通过"); SetStatus("管线自检:正常"); } @@ -1213,7 +1215,7 @@ namespace XericUI.ShaderBake.Editor // 否则只有一条状态栏提示,很容易被下一次别的状态覆盖掉,看不出来画面已经旧了 m_PendingRefresh = true; UpdateRenderButton(); - SetStatus("参数已改,按「重新渲染」出图"); + SetStatus("参数已改"); return; } if (m_RenderPending) @@ -1274,7 +1276,7 @@ namespace XericUI.ShaderBake.Editor m_Preview.SetResult(rt, m_Renderer.settings.output.size); if (measureCoverage) - MeasureCoverage(rt); + MeasureCoverage(rt, !fromHeartbeat); // 分格线与编号只跟参数、相机有关,而参数一改必然带一次非心跳渲染; // 心跳时再刷一遍等于每帧让 Yoga 重排整个覆盖层,这是预览发卡的来源之一 if (!fromHeartbeat) @@ -1302,13 +1304,20 @@ namespace XericUI.ShaderBake.Editor return false; } - private void MeasureCoverage(RenderTexture rt) + private void MeasureCoverage(RenderTexture rt, bool log) { float coverage; Color average; m_LastCoverage = ShaderBakeReadback.MeasureCoverage(rt, out coverage, out average) ? coverage : -1f; - if (m_LastCoverage >= 0f) - m_Preview.SetCoverage(m_LastCoverage, average); + if (!log || m_LastCoverage < 0f) + return; + // 数字不摆在界面上——画没画出来看图就知道了,这里只留给排查时从 Console / Editor.log 里翻。 + // 只在百分比变了才写一行:拖滑块时画面参数一直在变,读数不变就不该刷屏 + int percent = Mathf.RoundToInt(m_LastCoverage * 100f); + if (percent == m_LoggedCoverage) + return; + m_LoggedCoverage = percent; + Debug.Log("[ShaderBake] 不透明 " + percent + "%"); } // ── 测试视图 ──────────────────────────────────────────── @@ -1454,7 +1463,7 @@ namespace XericUI.ShaderBake.Editor m_Preview.SetResult(rt, m_Renderer.settings.output.size); if (measureCoverage) - MeasureCoverage(rt); + MeasureCoverage(rt, !fromHeartbeat); if (!fromHeartbeat) UpdateFaceOverlay(); UpdateSizeReadout(!fromHeartbeat); @@ -1482,36 +1491,6 @@ namespace XericUI.ShaderBake.Editor time += " · " + Mathf.RoundToInt(1000f / m_LiveFrameMs) + " fps"; m_StatusTime.text = time; } - UpdateMeshReadout(); - } - - private void UpdateMeshReadout() - { - // 顶点数只在状态栏出现:它决定细分够不够用,但不值得占一行界面 - Mesh mesh = m_Renderer != null ? m_Renderer.geometry : null; - if (m_DebugView != DebugView.None && m_Override.geometry != null) - mesh = m_Override.geometry; - if (mesh == null || m_StatusMessage == null) - return; - if (m_StatusMessage.text.StartsWith("导出") || m_StatusMessage.text.StartsWith("参数已改")) - return; - m_StatusMessage.text = (m_DebugView != DebugView.None ? "测试视图 · " : "已渲染 · ") - + mesh.vertexCount + " 顶点" + CoverageHint(); - } - - /// 状态栏的覆盖率后缀:把"看着像没渲染"拆成"没画出来"和"画出来但是透明的" - private string CoverageHint() - { - if (m_LastCoverage < 0f) - return string.Empty; - // 测试图 alpha 恒为 1,这里的占比量的是"几何盖住了多少画面",和透明没关系—— - // 用它一眼看出是相机没框住,还是材质渲不出东西 - if (m_DebugView != DebugView.None) - return m_LastCoverage <= 0.001f ? " · 画面全空,面片不在视锥里" - : " · 画面被面片盖住 " + Mathf.RoundToInt(m_LastCoverage * 100f) + "%"; - if (m_LastCoverage <= 0.001f) - return " · 全透明,一个像素都没画出"; - return " · 不透明 " + Mathf.RoundToInt(m_LastCoverage * 100f) + "%"; } private void SetStatus(string message) diff --git a/Editor/ShaderBake/BakeShaderWindow.uss b/Editor/ShaderBake/BakeShaderWindow.uss index a637065..958e063 100644 --- a/Editor/ShaderBake/BakeShaderWindow.uss +++ b/Editor/ShaderBake/BakeShaderWindow.uss @@ -128,7 +128,8 @@ position: absolute; left: 8px; bottom: 8px; - font-size: 11px; color: rgb(220, 220, 220); + font-size: 11px; + color: rgb(220, 220, 220); background-color: rgba(0, 0, 0, 0.45); padding: 1px 6px; border-radius: 3px; diff --git a/Editor/ShaderBake/ShaderBakePreviewPane.cs b/Editor/ShaderBake/ShaderBakePreviewPane.cs index ea6a136..436b383 100644 --- a/Editor/ShaderBake/ShaderBakePreviewPane.cs +++ b/Editor/ShaderBake/ShaderBakePreviewPane.cs @@ -43,7 +43,6 @@ namespace XericUI.ShaderBake.Editor private Texture m_Content; private int m_AppliedWidth = -1; private int m_AppliedHeight = -1; - private bool m_ReadoutAlert; private Vector2Int m_PixelSize = Vector2Int.zero; private float m_Zoom = 1f; private bool m_AutoFit = true; @@ -52,10 +51,6 @@ namespace XericUI.ShaderBake.Editor private Vector2 m_DragStart; private Vector2 m_ScrollStart; - /// 上一次渲染的不透明像素占比,-1 = 还没测过 - private float m_CoverageRatio = -1f; - private Color m_CoverageColor = Color.clear; - /// 当前缩放倍率(1 = 一个像素对应屏幕一个点) public float zoom { get { return m_Zoom; } } @@ -307,21 +302,9 @@ namespace XericUI.ShaderBake.Editor } } - /// - /// 报告这次结果里有多少像素不是全透明。看图时最先要确认的就是"到底画没画出来", - /// 而棋盘格背景会让"没画"和"画了个透明的"看起来完全一样。 - /// - public void SetCoverage(float opaqueRatio, Color averageColor) - { - m_CoverageRatio = opaqueRatio; - m_CoverageColor = averageColor; - UpdateReadout(); - } - public void Clear() { m_PixelSize = Vector2Int.zero; - m_CoverageRatio = -1f; // 清掉记录,下一次 SetResult 才会真的重设背景,而不是当"同一张图"直接重画 m_Content = null; m_AppliedWidth = m_AppliedHeight = -1; @@ -379,30 +362,10 @@ namespace XericUI.ShaderBake.Editor return; } string text = m_PixelSize.x + " × " + m_PixelSize.y + " px " + - (m_Zoom * 100f).ToString("0.#") + "%" + CoverageText(); + (m_Zoom * 100f).ToString("0.#") + "%"; // 文字没变就不写:Label 换文字要重新排版,心跳时这个字符串通常是一样的 if (m_Readout.text != text) m_Readout.text = text; - - // 全透明是"这次什么都没画出来"的信号,值得比别的读数更抢眼一点 - bool alert = m_CoverageRatio <= 0.001f; - if (alert != m_ReadoutAlert) - { - m_ReadoutAlert = alert; - m_Readout.style.color = new StyleColor(alert - ? new Color(0.98f, 0.51f, 0.41f) - : new Color(0.86f, 0.86f, 0.86f)); - } - } - - /// 覆盖率后缀;没测过就不占字数 - private string CoverageText() - { - if (m_CoverageRatio < 0f) - return string.Empty; - if (m_CoverageRatio <= 0.001f) - return " 全透明(没画出像素)"; - return " 不透明 " + Mathf.RoundToInt(m_CoverageRatio * 100f) + "%"; } private void OnViewportGeometry(GeometryChangedEvent evt)