From 92aed8e64bb0c6335d6e555bcf55265211971099 Mon Sep 17 00:00:00 2001
From: LiRuoChen <571244399@qq.com>
Date: Fri, 6 Nov 2026 18:39:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(ShaderBake):=20=E9=A2=84=E8=A7=88=E5=9B=BE?=
=?UTF-8?q?=E4=B8=8A=E7=94=BB=E5=88=86=E6=A0=BC=E7=BA=BF=E4=B8=8E=E6=AF=8F?=
=?UTF-8?q?=E6=A0=BC=20UV=20=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
加行/加列之后只看图分不清哪一片对应哪段 UV,只能靠点选一格再看右侧。
现在多格时图上会贴一层白色半透明分格线,每格左上角写 U?/V?,
白字垫在半透明黑底上,浅色结果图上也能读。
线和编号都按百分比定位,缩放与滚动不重算;线只随行列数重建、编号按格数复用,
实时预览每秒重画几十次也不会反复增删节点。只有一格时不画——这时右侧已经写着 UV。
编号所在格在屏幕上不足一个编号宽时自动不显示,避免 16×16 那种网格糊成一片。
---
Editor/ShaderBake/BakeShaderAsImageWindow.cs | 41 +++++-
Editor/ShaderBake/BakeShaderWindow.uss | 31 +++-
Editor/ShaderBake/BakeShaderWindow.uxml | 2 +
Editor/ShaderBake/ShaderBakePreviewPane.cs | 146 +++++++++++++++++++
4 files changed, 213 insertions(+), 7 deletions(-)
diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs
index ded89a1..b36ce71 100644
--- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs
+++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs
@@ -95,6 +95,8 @@ namespace XericUI.ShaderBake.Editor
/// 测试视图那张材质:_Mode 决定画哪种图,建一次反复用
private Material m_DebugMaterial;
private int m_SelectedFace;
+ /// 给预览面板的分格数据:每帧重填,避免按格新建列表
+ private readonly List m_GridCells = new List();
/// 预览换成"量几何与 UV"的测试图。都不吃贴图、不吃光照,画不出来的原因只剩一个。
/// Uv/Gradient/Checker 的取值与 shader 的 _Mode 一一对应
@@ -763,7 +765,7 @@ namespace XericUI.ShaderBake.Editor
if (y != null) y.SetEnabled(enabled);
}
- /// 把选中格的屏幕框和 UV 编号贴到浏览图上
+ /// 把选中格的屏幕框、分格线和每格的 UV 编号贴到浏览图上
private void UpdateFaceOverlay()
{
if (m_Preview == null || m_Renderer == null)
@@ -772,17 +774,46 @@ namespace XericUI.ShaderBake.Editor
if (surface.kind == ShaderBakeSurfaceKind.Mesh && surface.sourceMesh != null)
{
m_Preview.SetFaceSelection(false, Vector2.zero, Vector2.zero, string.Empty);
+ m_Preview.SetFaceGrid(null, 0, 0);
return;
}
- Vector2 min, max;
- if (!m_Renderer.TryGetFaceViewportBounds(m_SelectedFace, out min, out max))
+ int columns = Mathf.Max(surface.gridColumns, 1);
+ int rows = Mathf.Max(surface.gridRows, 1);
+ m_GridCells.Clear();
+ for (int i = 0; i < columns * rows; i++)
+ {
+ Vector2 min, max;
+ ShaderBakeFaceCell cell = surface.GetFace(i);
+ if (!m_Renderer.TryGetFaceViewportBounds(i, out min, out max))
+ continue;
+ // 完全在画面外的那几格(按「选中格铺满」之后就只剩一格可见)不参与,
+ // 否则它们的包围盒会被夹成零面积,编号全挤在画面边上
+ if (max.x - min.x < 0.001f || max.y - min.y < 0.001f)
+ continue;
+ m_GridCells.Add(new ShaderBakePreviewPane.FaceCellRect
+ {
+ min = min,
+ max = max,
+ label = "U" + cell.uvX + " V" + cell.uvY
+ });
+ }
+ m_Preview.SetFaceGrid(m_GridCells, columns, rows);
+
+ Vector2 selMin, selMax;
+ if (!m_Renderer.TryGetFaceViewportBounds(m_SelectedFace, out selMin, out selMax))
{
m_Preview.SetFaceSelection(false, Vector2.zero, Vector2.zero, string.Empty);
return;
}
- ShaderBakeFaceCell cell = surface.GetFace(m_SelectedFace);
- m_Preview.SetFaceSelection(true, min, max, "UV (" + cell.uvX + ", " + cell.uvY + ")");
+ // 分了格就由每格的编号说明 UV,选中框只留框,不然同一格里两行字叠着
+ m_Preview.SetFaceSelection(true, selMin, selMax, columns * rows > 1 ? string.Empty : SelectedFaceLabel());
+ }
+
+ private string SelectedFaceLabel()
+ {
+ ShaderBakeFaceCell cell = SelectedFaceCell();
+ return cell == null ? string.Empty : "UV (" + cell.uvX + ", " + cell.uvY + ")";
}
// ── 面片 ────────────────────────────────────────────────
diff --git a/Editor/ShaderBake/BakeShaderWindow.uss b/Editor/ShaderBake/BakeShaderWindow.uss
index 8848ed6..a637065 100644
--- a/Editor/ShaderBake/BakeShaderWindow.uss
+++ b/Editor/ShaderBake/BakeShaderWindow.uss
@@ -96,12 +96,39 @@
opacity: 0.9;
}
+/* 分格线浮在图上:1px 白线 + 每格一个 UV 编号,都用百分比定位,缩放/滚动不用重排 */
+.grid-overlay {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ display: none;
+ /* 贴边的编号宁可被裁掉,也不该糊到图上之外 */
+ overflow: hidden;
+}
+
+.grid-line {
+ position: absolute;
+ background-color: rgba(255, 255, 255, 0.38);
+}
+
+.grid-cell-label {
+ position: absolute;
+ font-size: 10px;
+ /* 白字压在半透明黑底上:浅色贴图上白字会糊掉,垫一层才读得出来 */
+ color: rgba(255, 255, 255, 0.88);
+ background-color: rgba(0, 0, 0, 0.38);
+ padding: 0 4px;
+ border-radius: 2px;
+ -unity-text-align: middle-left;
+}
+
.preview-readout {
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/BakeShaderWindow.uxml b/Editor/ShaderBake/BakeShaderWindow.uxml
index a8e9565..45f7746 100644
--- a/Editor/ShaderBake/BakeShaderWindow.uxml
+++ b/Editor/ShaderBake/BakeShaderWindow.uxml
@@ -39,6 +39,8 @@
+
+
diff --git a/Editor/ShaderBake/ShaderBakePreviewPane.cs b/Editor/ShaderBake/ShaderBakePreviewPane.cs
index f75a417..e9ae4a6 100644
--- a/Editor/ShaderBake/ShaderBakePreviewPane.cs
+++ b/Editor/ShaderBake/ShaderBakePreviewPane.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using UnityEngine.UIElements;
@@ -22,6 +23,14 @@ namespace XericUI.ShaderBake.Editor
private readonly Label m_Readout;
private readonly VisualElement m_FaceOverlay;
private readonly Label m_FaceOverlayLabel;
+ private readonly VisualElement m_GridOverlay;
+
+ // 分格层:线的条数只随行列数变,编号只随格子数变,所以按数量复用,不每帧重建
+ private readonly List m_GridVerticals = new List();
+ private readonly List m_GridHorizontals = new List();
+ private readonly List