diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs
index b36ce71..73e1a00 100644
--- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs
+++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs
@@ -39,12 +39,17 @@ namespace XericUI.ShaderBake.Editor
/// 测试视图用的那张 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;
+ ///
+ /// 实时预览的节拍上限:有焦点时按 60fps 排,失焦降到 20fps。
+ ///
+ /// 这只是"最早什么时候重画",真正的帧率还受渲染耗时和编辑器自己的刷新率限制——
+ /// 所以别处只管少做无用功,别指望靠调这个数字把卡顿调掉。
+ ///
+ private const double kLiveIntervalFocused = 1.0 / 60.0;
+ private const double kLiveIntervalBlurred = 1.0 / 20.0;
- /// 覆盖率读数降频:它要 ReadPixels,是这一轮里唯一会同步显卡的一步
- private const double kCoverageInterval = 0.5;
+ /// 覆盖率读数降频:它要 ReadPixels,会同步一次显卡,实时预览里做多了就是顿感来源
+ private const double kCoverageInterval = 2.0;
private const float kDefaultDetailWidth = 340f;
private static readonly string[] kAntiAliasingChoices = { "1", "2", "4", "8" };
@@ -86,6 +91,11 @@ namespace XericUI.ShaderBake.Editor
private bool m_PendingRefresh;
private double m_LastRenderMs = -1;
private double m_NextLiveRender;
+ /// 上一次心跳的时刻;用来量两次心跳之间实际隔了多久
+ private double m_LastHeartbeatTime;
+ /// 实测心跳间隔(毫秒),-1 = 还没量到
+ private float m_LiveFrameMs = -1f;
+ private double m_NextStatusUpdate;
private double m_NextCoverageCheck;
/// 上一次结果的不透明像素占比,-1 = 没测出来
private float m_LastCoverage = -1f;
@@ -191,6 +201,16 @@ namespace XericUI.ShaderBake.Editor
double now = EditorApplication.timeSinceStartup;
if (now < m_NextLiveRender)
return;
+
+ // 实测两次心跳之间的间隔。它是"看到的帧率",和渲染本身花了多少毫秒不是一回事:
+ // 卡在别处时两个数会差很远,只有摆出来才分得清是谁的问题
+ if (m_LastHeartbeatTime > 0.0)
+ {
+ float delta = (float)((now - m_LastHeartbeatTime) * 1000.0);
+ m_LiveFrameMs = m_LiveFrameMs < 0f ? delta : Mathf.Lerp(m_LiveFrameMs, delta, 0.3f);
+ }
+ m_LastHeartbeatTime = now;
+
m_NextLiveRender = now + (hasFocus ? kLiveIntervalFocused : kLiveIntervalBlurred);
DoRender(true);
}
@@ -324,6 +344,8 @@ namespace XericUI.ShaderBake.Editor
{
// 这个勾就是"要不要一直重画"的总开关:打开时把攒下的待刷新立刻补上,
// 关掉时不再重画,只把它记成待刷新显示在「重新渲染」上
+ m_LastHeartbeatTime = 0.0;
+ m_LiveFrameMs = -1f;
UpdateRenderButton();
if (evt.newValue && m_PendingRefresh)
DoRender();
@@ -1258,7 +1280,7 @@ namespace XericUI.ShaderBake.Editor
bool measureCoverage = ShouldMeasureCoverage(fromHeartbeat);
bool wantDebugView = m_DebugView != DebugView.None;
- if (wantDebugView && RenderDebugView(measureCoverage))
+ if (wantDebugView && RenderDebugView(measureCoverage, fromHeartbeat))
return;
if (wantDebugView)
{
@@ -1277,15 +1299,18 @@ namespace XericUI.ShaderBake.Editor
{
m_Preview.Clear();
SetStatus(string.IsNullOrEmpty(m_Renderer.lastError) ? "渲染失败" : m_Renderer.lastError);
- UpdateSizeReadout();
+ UpdateSizeReadout(true);
return;
}
m_Preview.SetResult(rt, m_Renderer.settings.output.size);
if (measureCoverage)
MeasureCoverage(rt);
- UpdateFaceOverlay();
- UpdateSizeReadout();
+ // 分格线与编号只跟参数、相机有关,而参数一改必然带一次非心跳渲染;
+ // 心跳时再刷一遍等于每帧让 Yoga 重排整个覆盖层,这是预览发卡的来源之一
+ if (!fromHeartbeat)
+ UpdateFaceOverlay();
+ UpdateSizeReadout(!fromHeartbeat);
if (fromHeartbeat)
return;
if (string.IsNullOrEmpty(m_StatusMessage.text) || m_StatusMessage.text.StartsWith("导出") || m_StatusMessage.text.StartsWith("参数已改"))
@@ -1293,8 +1318,8 @@ namespace XericUI.ShaderBake.Editor
}
///
- /// 覆盖率量的是"这一轮画面上有没有东西",慢变化,半秒一次足够;
- /// 心跳 24fps 时每次都量的话,每帧都要同步一次显卡,实时预览就变成卡顿本身。
+ /// 覆盖率量的是"这一轮画面上有没有东西",慢变化,两秒一次足够;参数一改则立刻量。
+ /// 心跳时每次都量的话,每帧都要同步一次显卡,实时预览就变成卡顿本身。
/// 不量的时候沿用上一个读数,界面不会因此少信息。
///
private bool ShouldMeasureCoverage(bool fromHeartbeat)
@@ -1471,7 +1496,7 @@ namespace XericUI.ShaderBake.Editor
///
/// 只换"看"的那张图:导出、材质属性表、写回原材质都不受影响,仍走真实材质。
///
- private bool RenderDebugView(bool measureCoverage)
+ private bool RenderDebugView(bool measureCoverage, bool fromHeartbeat)
{
if (!EnsureDebugMaterial())
return false;
@@ -1489,17 +1514,33 @@ namespace XericUI.ShaderBake.Editor
m_Preview.SetResult(rt, m_Renderer.settings.output.size);
if (measureCoverage)
MeasureCoverage(rt);
- UpdateFaceOverlay();
- UpdateSizeReadout();
+ if (!fromHeartbeat)
+ UpdateFaceOverlay();
+ UpdateSizeReadout(!fromHeartbeat);
return true;
}
- private void UpdateSizeReadout()
+ ///
+ /// 参数改动、换测试视图这类"画面刚变"的时刻要立刻反映;
+ /// 心跳则走 5Hz 节流——数字每帧变一次等于每帧都让状态栏重排一遍
+ ///
+ private void UpdateSizeReadout(bool immediate)
{
+ double now = EditorApplication.timeSinceStartup;
+ if (!immediate && now < m_NextStatusUpdate)
+ return;
+ m_NextStatusUpdate = now + 0.2;
+
if (m_StatusSize != null)
m_StatusSize.text = m_Renderer.settings.output.width + "×" + m_Renderer.settings.output.height;
if (m_StatusTime != null)
- m_StatusTime.text = m_LastRenderMs < 0.0 ? "-" : m_LastRenderMs.ToString("0.0") + " ms";
+ {
+ string time = m_LastRenderMs < 0.0 ? "-" : m_LastRenderMs.ToString("0.0") + " ms";
+ // 只在实时预览开着时报帧率:关掉之后那个数是上一次的,摆着会误导
+ if (m_LiveFrameMs > 0.5f && m_AutoRefreshToggle != null && m_AutoRefreshToggle.value)
+ time += " · " + Mathf.RoundToInt(1000f / m_LiveFrameMs) + " fps";
+ m_StatusTime.text = time;
+ }
UpdateMeshReadout();
}
diff --git a/Editor/ShaderBake/ShaderBakePreviewPane.cs b/Editor/ShaderBake/ShaderBakePreviewPane.cs
index e9ae4a6..ea6a136 100644
--- a/Editor/ShaderBake/ShaderBakePreviewPane.cs
+++ b/Editor/ShaderBake/ShaderBakePreviewPane.cs
@@ -39,6 +39,11 @@ namespace XericUI.ShaderBake.Editor
private int m_CheckerWidth;
private int m_CheckerHeight;
private bool m_CheckerVisible;
+ /// 上一次挂上去的那张图;引用没变就只重画,不重设样式
+ 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;
@@ -86,11 +91,22 @@ namespace XericUI.ShaderBake.Editor
/// 挂上这次渲染的结果。传 null 表示"没有结果",只清读数。
public void SetResult(Texture content, Vector2Int pixelSize)
{
+ // 实时预览每秒重画几十次,但画进的是同一张 RT:内容每帧都在变,背景引用没变。
+ // 这时只要一次重画,不必再走一遍样式解析 + 重新适配尺寸 + 重写读数
+ bool sameContent = ReferenceEquals(content, m_Content) && pixelSize == m_PixelSize;
+ m_Content = content;
m_PixelSize = pixelSize;
+ if (sameContent)
+ {
+ m_Image.MarkDirtyRepaint();
+ return;
+ }
+
m_Image.style.backgroundImage = ToBackground(content);
if (m_AutoFit)
FitToView();
- ApplySize();
+ else
+ ApplySize();
}
///
@@ -115,7 +131,11 @@ namespace XericUI.ShaderBake.Editor
return;
m_Checker.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
if (visible)
+ {
+ // 尺寸没变时 ApplySize 会跳过写样式,这里要强制走一遍,否则棋盘纹理不会被建出来
+ m_AppliedWidth = m_AppliedHeight = -1;
ApplySize();
+ }
}
public void ZoomIn() { SetZoom(m_Zoom * 1.25f); }
@@ -302,6 +322,9 @@ namespace XericUI.ShaderBake.Editor
{
m_PixelSize = Vector2Int.zero;
m_CoverageRatio = -1f;
+ // 清掉记录,下一次 SetResult 才会真的重设背景,而不是当"同一张图"直接重画
+ m_Content = null;
+ m_AppliedWidth = m_AppliedHeight = -1;
m_Image.style.backgroundImage = new StyleBackground(StyleKeyword.None);
UpdateReadout();
}
@@ -327,15 +350,22 @@ namespace XericUI.ShaderBake.Editor
{
m_Frame.style.width = 0f;
m_Frame.style.height = 0f;
+ m_AppliedWidth = m_AppliedHeight = -1;
UpdateReadout();
return;
}
int width = Mathf.Max(1, Mathf.RoundToInt(m_PixelSize.x * m_Zoom));
int height = Mathf.Max(1, Mathf.RoundToInt(m_PixelSize.y * m_Zoom));
- m_Frame.style.width = width;
- m_Frame.style.height = height;
- if (m_CheckerVisible)
- EnsureChecker(width, height);
+ // 尺寸没变就别再写一遍:写样式会让整个预览做一次布局,心跳时这是白花的
+ if (width != m_AppliedWidth || height != m_AppliedHeight)
+ {
+ m_AppliedWidth = width;
+ m_AppliedHeight = height;
+ m_Frame.style.width = width;
+ m_Frame.style.height = height;
+ if (m_CheckerVisible)
+ EnsureChecker(width, height);
+ }
UpdateReadout();
}
@@ -348,12 +378,21 @@ namespace XericUI.ShaderBake.Editor
m_Readout.text = "无结果";
return;
}
- m_Readout.text = m_PixelSize.x + " × " + m_PixelSize.y + " px " +
- (m_Zoom * 100f).ToString("0.#") + "%" + CoverageText();
+ string text = m_PixelSize.x + " × " + m_PixelSize.y + " px " +
+ (m_Zoom * 100f).ToString("0.#") + "%" + CoverageText();
+ // 文字没变就不写:Label 换文字要重新排版,心跳时这个字符串通常是一样的
+ if (m_Readout.text != text)
+ m_Readout.text = text;
+
// 全透明是"这次什么都没画出来"的信号,值得比别的读数更抢眼一点
- m_Readout.style.color = new StyleColor(m_PixelSize.x > 0 && m_CoverageRatio <= 0.001f
- ? new Color(0.98f, 0.51f, 0.41f)
- : new Color(0.86f, 0.86f, 0.86f));
+ 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));
+ }
}
/// 覆盖率后缀;没测过就不占字数