feat(ShaderBake): 面片网格与选面、导出尺寸预设

- 面片改成"一格一张 UV 区域"的网格,向左/下扩展时新格 UV 编号递减(左邻为 [-1,0])
- 每格 UV 编号可单独改写,并在右侧实时显示
- 浏览图支持点选面片(与烘焙同一套投影做射线求交),选中格显示高亮框与 UV 编号
- 输出尺寸增加常用预设下拉与"匹配面片比例"
This commit is contained in:
2026-11-05 17:43:11 +08:00
parent 0db9bd5462
commit a0512ad450
7 changed files with 583 additions and 42 deletions
@@ -35,6 +35,14 @@ namespace XericUI.ShaderBake.Editor
private const float kDefaultDetailWidth = 340f;
private static readonly string[] kAntiAliasingChoices = { "1", "2", "4", "8" };
private const string kCustomSize = "自定义";
/// <summary> 常用导出尺寸。最后一项只是让当前值不在表里时下拉框有个落点 </summary>
private static readonly string[] kSizePresets =
{
"256 × 256", "512 × 512", "1024 × 1024", "2048 × 2048", "4096 × 4096",
"512 × 256", "1024 × 512", "2048 × 1024", kCustomSize
};
private ShaderBakeMaterialSource m_Source;
private ShaderBakeRenderer m_Renderer;
@@ -59,6 +67,7 @@ namespace XericUI.ShaderBake.Editor
private bool m_RenderPending;
private double m_LastRenderMs = -1;
private int m_SelectedFace;
[MenuItem(XericRegistrationPaths.ToolBar + "/Bake Shader As Image", false, 20)]
private static void OpenFromMenu()
@@ -99,8 +108,11 @@ namespace XericUI.ShaderBake.Editor
return;
}
m_Preview.faceClicked += OnFaceClicked;
CollectReferences();
BuildPropertyTable();
BindFaceGrid();
BindToolbar();
BindSections();
BindSettings();
@@ -404,6 +416,15 @@ namespace XericUI.ShaderBake.Editor
private void BindOutput()
{
DropdownField preset = rootVisualElement.Q<DropdownField>("out-preset");
if (preset != null)
{
preset.choices = new List<string>(kSizePresets);
m_Syncers.Add(() => preset.SetValueWithoutNotify(CurrentSizePreset()));
preset.RegisterValueChangedCallback(evt => ApplySizePreset(evt.newValue));
}
Click("out-fit-aspect", FitOutputAspect);
BindInt("out-width", () => m_Renderer.settings.output.width, v => m_Renderer.settings.output.width = v);
BindInt("out-height", () => m_Renderer.settings.output.height, v => m_Renderer.settings.output.height = v);
BindInt("out-depth", () => m_Renderer.settings.output.depthBuffer, v => m_Renderer.settings.output.depthBuffer = v);
@@ -427,6 +448,167 @@ namespace XericUI.ShaderBake.Editor
}
}
private string CurrentSizePreset()
{
Vector2Int size = m_Renderer.settings.output.size;
string label = size.x + " × " + size.y;
for (int i = 0; i < kSizePresets.Length - 1; i++)
if (kSizePresets[i] == label)
return label;
return kCustomSize;
}
private void ApplySizePreset(string label)
{
if (label == kCustomSize)
return;
string[] parts = label.Split('×');
if (parts.Length != 2)
return;
if (!int.TryParse(parts[0].Trim(), out int width) || !int.TryParse(parts[1].Trim(), out int height))
return;
m_Renderer.settings.output.width = width;
m_Renderer.settings.output.height = height;
Commit();
}
/// <summary> 按面片网格的整体宽高比把高度对上,省得手算 </summary>
private void FitOutputAspect()
{
ShaderBakeSettings settings = m_Renderer.settings;
float totalWidth = settings.surface.size.x * settings.surface.gridColumns;
float totalHeight = settings.surface.size.y * settings.surface.gridRows;
if (totalWidth <= 0.0001f || totalHeight <= 0.0001f)
return;
settings.output.height = Mathf.Clamp(
Mathf.RoundToInt(settings.output.width * totalHeight / totalWidth),
ShaderBakeOutputSettings.kMinDimension, ShaderBakeOutputSettings.kMaxDimension);
Commit();
SetStatus("高度已按面片比例对齐");
}
// ── 面片网格与选面 ──────────────────────────────────────
private void BindFaceGrid()
{
Click("grid-left", () => ResizeGrid(true, true));
Click("grid-right", () => ResizeGrid(false, true));
Click("grid-down", () => ResizeGrid(true, false));
Click("grid-up", () => ResizeGrid(false, false));
Click("grid-reset", () =>
{
m_Renderer.settings.surface.ResetGrid();
m_SelectedFace = 0;
Commit();
});
Click("face-zero", () =>
{
ShaderBakeFaceCell cell = SelectedFaceCell();
if (cell == null)
return;
cell.uvX = 0;
cell.uvY = 0;
Commit();
});
BindInt("face-uv-x",
() => SelectedFaceCell() != null ? SelectedFaceCell().uvX : 0,
v => { ShaderBakeFaceCell cell = SelectedFaceCell(); if (cell != null) cell.uvX = v; });
BindInt("face-uv-y",
() => SelectedFaceCell() != null ? SelectedFaceCell().uvY : 0,
v => { ShaderBakeFaceCell cell = SelectedFaceCell(); if (cell != null) cell.uvY = v; });
}
/// <summary>
/// 在左/右加一列,或上/下加一行。新格的 UV 编号由 <see cref="ShaderBakeSurfaceSettings"/>
/// 按贴边那一格往外推,所以向左加出来的一定是 [-1,0] 这种负号区间。
/// </summary>
private void ResizeGrid(bool negativeSide, bool column)
{
ShaderBakeSurfaceSettings surface = m_Renderer.settings.surface;
if (column)
surface.AddColumn(!negativeSide);
else
surface.AddRow(!negativeSide);
Commit();
SetStatus(surface.gridColumns + " × " + surface.gridRows + " 格");
}
private ShaderBakeFaceCell SelectedFaceCell()
{
if (m_Renderer == null)
return null;
ShaderBakeSurfaceSettings surface = m_Renderer.settings.surface;
if (surface.kind == ShaderBakeSurfaceKind.Mesh && surface.sourceMesh != null)
return null;
return surface.GetFace(m_SelectedFace);
}
private void OnFaceClicked(Vector2 viewport01)
{
int face;
if (!m_Renderer.TryPickFace(viewport01, out face))
return;
m_SelectedFace = face;
RefreshFaceUi();
SetStatus("选中第 " + (face + 1) + " 格");
}
private void RefreshFaceUi()
{
if (m_Renderer == null)
return;
ShaderBakeSurfaceSettings surface = m_Renderer.settings.surface;
int count = surface.FaceCount;
m_SelectedFace = Mathf.Clamp(m_SelectedFace, 0, Mathf.Max(count - 1, 0));
Label gridInfo = rootVisualElement.Q<Label>("grid-info");
if (gridInfo != null)
gridInfo.text = surface.gridColumns + " × " + surface.gridRows + " 格";
bool meshMode = surface.kind == ShaderBakeSurfaceKind.Mesh && surface.sourceMesh != null;
ShaderBakeFaceCell cell = meshMode ? null : surface.GetFace(m_SelectedFace);
Label faceInfo = rootVisualElement.Q<Label>("face-info");
if (faceInfo != null)
{
faceInfo.text = meshMode
? "外部网格不参与面片点选"
: "选中第 " + (m_SelectedFace + 1) + " 格:UV (" + cell.uvX + ", " + cell.uvY + ")";
}
SetFaceFieldsEnabled(!meshMode);
UpdateFaceOverlay();
}
private void SetFaceFieldsEnabled(bool enabled)
{
IntegerField x = rootVisualElement.Q<IntegerField>("face-uv-x");
IntegerField y = rootVisualElement.Q<IntegerField>("face-uv-y");
if (x != null) x.SetEnabled(enabled);
if (y != null) y.SetEnabled(enabled);
}
/// <summary> 把选中格的屏幕框和 UV 编号贴到浏览图上 </summary>
private void UpdateFaceOverlay()
{
if (m_Preview == null || m_Renderer == null)
return;
ShaderBakeSurfaceSettings surface = m_Renderer.settings.surface;
if (surface.kind == ShaderBakeSurfaceKind.Mesh && surface.sourceMesh != null)
{
m_Preview.SetFaceSelection(false, Vector2.zero, Vector2.zero, string.Empty);
return;
}
Vector2 min, max;
if (!m_Renderer.TryGetFaceViewportBounds(m_SelectedFace, out min, out max))
{
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 + ")");
}
// ── 面片 ────────────────────────────────────────────────
private void BindSurface()
@@ -698,6 +880,7 @@ namespace XericUI.ShaderBake.Editor
m_Renderer.settings.ClampAll();
m_Renderer.InvalidateGeometry();
SyncUiFromSettings();
RefreshFaceUi();
RequestRender();
}
@@ -758,6 +941,7 @@ namespace XericUI.ShaderBake.Editor
}
m_Preview.SetResult(rt, m_Renderer.settings.output.size);
UpdateFaceOverlay();
UpdateSizeReadout();
if (string.IsNullOrEmpty(m_StatusMessage.text) || m_StatusMessage.text.StartsWith("导出"))
SetStatus("已渲染");
+28
View File
@@ -181,6 +181,34 @@
margin-right: 4px;
}
.field-quarter {
flex-grow: 1;
flex-shrink: 1;
min-width: 0;
margin-right: 3px;
font-size: 10px;
}
/* ── 浏览图里的选中面片高亮 ── */
.face-overlay {
position: absolute;
display: none;
border-width: 1px;
border-color: rgb(255, 196, 64);
background-color: rgba(255, 196, 64, 0.14);
}
.face-overlay-label {
position: absolute;
left: 2px;
top: 2px;
font-size: 10px;
color: rgb(255, 224, 160);
background-color: rgba(0, 0, 0, 0.55);
padding: 0 4px;
border-radius: 2px;
}
.field-toggle {
font-size: 11px;
margin-top: 2px;
+29 -2
View File
@@ -38,6 +38,10 @@
<ui:VisualElement name="preview-frame" class="preview-frame">
<ui:Image name="preview-checker" class="preview-checker" />
<ui:Image name="preview-image" class="preview-image" />
<!-- 选中面片的高亮:位置按百分比算,缩放时不用重排 -->
<ui:VisualElement name="face-overlay" class="face-overlay">
<ui:Label name="face-overlay-label" class="face-overlay-label" text="UV (0,0)" />
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:ScrollView>
@@ -68,6 +72,10 @@
<ui:VisualElement name="sec-output" class="section">
<ui:Toggle name="sec-output-head" label="输出" value="true" class="section-head" />
<ui:VisualElement name="sec-output-body" class="section-body">
<ui:VisualElement class="field-row">
<ui:DropdownField name="out-preset" label="预设" class="field-half" />
<ui:Button name="out-fit-aspect" text="匹配面片比例" class="field-half" />
</ui:VisualElement>
<ui:VisualElement class="field-row">
<xer:IntegerField name="out-width" label="宽" class="field-half" />
<xer:IntegerField name="out-height" label="高" class="field-half" />
@@ -94,9 +102,28 @@
<xer:FloatField name="surf-size-y" label="高" class="field-half" />
</ui:VisualElement>
<ui:VisualElement class="field-row">
<xer:IntegerField name="surf-seg-x" label="列" class="field-half" />
<xer:IntegerField name="surf-seg-y" label="行" class="field-half" />
<xer:IntegerField name="surf-seg-x" label="面内细分列" class="field-half" />
<xer:IntegerField name="surf-seg-y" label="面内细分行" class="field-half" />
</ui:VisualElement>
<ui:Label class="field-note" text="面片网格(一格一张 UV 区域,向左/下扩展编号递减)" />
<ui:Label name="grid-info" class="field-note" text="1 × 1" />
<ui:VisualElement class="field-row">
<ui:Button name="grid-left" text="←加列" class="field-quarter" />
<ui:Button name="grid-right" text="加列→" class="field-quarter" />
<ui:Button name="grid-down" text="↓加行" class="field-quarter" />
<ui:Button name="grid-up" text="↑加行" class="field-quarter" />
</ui:VisualElement>
<ui:VisualElement class="field-row">
<ui:Button name="grid-reset" text="恢复 1×1" class="field-half" />
<ui:Button name="face-zero" text="选中面归零" class="field-half" />
</ui:VisualElement>
<ui:Label name="face-info" class="field-note" text="在左侧浏览图里点选面片" />
<ui:VisualElement class="field-row">
<xer:IntegerField name="face-uv-x" label="UV X" class="field-half" />
<xer:IntegerField name="face-uv-y" label="UV Y" class="field-half" />
</ui:VisualElement>
<ui:Label class="field-note" text="UV" />
<ui:VisualElement class="field-row">
<xer:FloatField name="surf-uv-off-x" label="偏移X" class="field-half" />
@@ -20,6 +20,11 @@ namespace XericUI.ShaderBake.Editor
private readonly Image m_Checker;
private readonly Image m_Image;
private readonly Label m_Readout;
private readonly VisualElement m_FaceOverlay;
private readonly Label m_FaceOverlayLabel;
/// <summary> 在图上点了一下(不是拖拽)。参数是 0~1、左上为原点的坐标 </summary>
public event Action<Vector2> faceClicked;
private Texture2D m_CheckerTexture;
private int m_CheckerWidth;
@@ -29,6 +34,7 @@ namespace XericUI.ShaderBake.Editor
private float m_Zoom = 1f;
private bool m_AutoFit = true;
private bool m_Dragging;
private bool m_PointerMoved;
private Vector2 m_DragStart;
private Vector2 m_ScrollStart;
@@ -46,6 +52,10 @@ namespace XericUI.ShaderBake.Editor
m_Checker = root.Q<Image>("preview-checker");
m_Image = root.Q<Image>("preview-image");
m_Readout = root.Q<Label>("preview-readout");
m_FaceOverlay = root.Q<VisualElement>("face-overlay");
m_FaceOverlayLabel = root.Q<Label>("face-overlay-label");
if (m_FaceOverlay != null)
m_FaceOverlay.pickingMode = PickingMode.Ignore;
if (m_Viewport == null || m_Frame == null || m_Image == null)
throw new InvalidOperationException("BakeShaderWindow.uxml 缺少预览区节点");
@@ -106,6 +116,27 @@ namespace XericUI.ShaderBake.Editor
SetZoom(fit);
}
/// <summary>
/// 把选中面片的框贴到图上。范围是 0~1(左上为原点),用百分比定位,缩放/滚动都不用重算。
/// </summary>
public void SetFaceSelection(bool visible, Vector2 min, Vector2 max, string label)
{
if (m_FaceOverlay == null)
return;
if (!visible)
{
m_FaceOverlay.style.display = DisplayStyle.None;
return;
}
m_FaceOverlay.style.display = DisplayStyle.Flex;
m_FaceOverlay.style.left = Length.Percent(Mathf.Clamp01(min.x) * 100f);
m_FaceOverlay.style.top = Length.Percent(Mathf.Clamp01(min.y) * 100f);
m_FaceOverlay.style.width = Length.Percent(Mathf.Max(max.x - min.x, 0.002f) * 100f);
m_FaceOverlay.style.height = Length.Percent(Mathf.Max(max.y - min.y, 0.002f) * 100f);
if (m_FaceOverlayLabel != null)
m_FaceOverlayLabel.text = label;
}
public void Clear()
{
m_PixelSize = Vector2Int.zero;
@@ -188,6 +219,7 @@ namespace XericUI.ShaderBake.Editor
if (m_PixelSize.x <= 0)
return;
m_Dragging = true;
m_PointerMoved = false;
m_DragStart = evt.position;
m_ScrollStart = m_Viewport.scrollOffset;
m_Viewport.CapturePointer(evt.pointerId);
@@ -200,6 +232,8 @@ namespace XericUI.ShaderBake.Editor
return;
// 2022.1 的 position 是 Vector3,直接和 Vector2 相减会二义
Vector2 delta = (Vector2)evt.position - m_DragStart;
if (delta.sqrMagnitude > 16f)
m_PointerMoved = true;
m_Viewport.scrollOffset = m_ScrollStart - delta;
}
@@ -207,6 +241,18 @@ namespace XericUI.ShaderBake.Editor
{
m_Dragging = false;
m_Viewport.ReleasePointer(evt.pointerId);
if (m_PointerMoved || m_PixelSize.x <= 0 || faceClicked == null)
return;
// 没拖动才算点选:拖动是平移视图,抬手时不该顺手换掉选中的面
Rect bounds = m_Frame.worldBound;
var position = new Vector2(evt.position.x, evt.position.y);
if (bounds.width < 1f || bounds.height < 1f || !bounds.Contains(position))
return;
// 统一用"左上为原点"的 0~1 坐标,和 Renderer.TryPickFace 的约定一致
faceClicked.Invoke(new Vector2(
(position.x - bounds.x) / bounds.width,
(position.y - bounds.y) / bounds.height));
}
/// <summary>