fix(ShaderBake): 投影按内容宽高比铺满输出,不再跟着输出比例留白
正交投影原来按输出宽高比推半宽(半宽 = 半高 × 输出比例), 所以 1024×4096 的输出里一张 1×1 的面片只占中间一条,UV 也到不了 0~1。 现在框取时把内容的半宽/半高都记下来,投影按内容比例取半宽: 输出比例和面片比例不同时就靠拉伸,一格正好等于一整张图; m×n 的分格因此天然是每格 1/m × 1/n。面片宽高、细分、来源变了会顺手重框。 旧存档 fitRevision 1 → 2,开窗按新约定重框一次。 UV 测试视图去掉每格色相混色:0 点必须是纯黑,否则分辨不出原点。
This commit is contained in:
@@ -844,6 +844,8 @@ namespace XericUI.ShaderBake.Editor
|
||||
kind.RegisterValueChangedCallback(evt =>
|
||||
{
|
||||
m_Renderer.settings.surface.kind = (ShaderBakeSurfaceKind)evt.newValue;
|
||||
// 换了来源,内容的宽高比也跟着换,投影得按新的重算
|
||||
m_Renderer.FitCameraToGeometry();
|
||||
Commit();
|
||||
});
|
||||
}
|
||||
@@ -896,11 +898,13 @@ namespace XericUI.ShaderBake.Editor
|
||||
importModel.clicked += ImportModel;
|
||||
}
|
||||
|
||||
// 面片那些"改一个分量"的写法摊成方法,绑定处只留一行,读起来不至于全是三元组
|
||||
private void SetSizeX(float v) { Vector2 s = m_Renderer.settings.surface.size; s.x = v; m_Renderer.settings.surface.size = s; }
|
||||
private void SetSizeY(float v) { Vector2 s = m_Renderer.settings.surface.size; s.y = v; m_Renderer.settings.surface.size = s; }
|
||||
private void SetSegmentX(int v) { Vector2Int s = m_Renderer.settings.surface.segments; s.x = v; m_Renderer.settings.surface.segments = s; }
|
||||
private void SetSegmentY(int v) { Vector2Int s = m_Renderer.settings.surface.segments; s.y = v; m_Renderer.settings.surface.segments = s; }
|
||||
// 面片那些"改一个分量"的写法摊成方法,绑定处只留一行,读起来不至于全是三元组。
|
||||
// 形状一变,投影里记的宽高比就过期了,画面会被裁一半或留一圈边;
|
||||
// 这几项改完顺手重框一次,保证内容始终铺满输出
|
||||
private void SetSizeX(float v) { Vector2 s = m_Renderer.settings.surface.size; s.x = v; m_Renderer.settings.surface.size = s; m_Renderer.FitCameraToGeometry(); }
|
||||
private void SetSizeY(float v) { Vector2 s = m_Renderer.settings.surface.size; s.y = v; m_Renderer.settings.surface.size = s; m_Renderer.FitCameraToGeometry(); }
|
||||
private void SetSegmentX(int v) { Vector2Int s = m_Renderer.settings.surface.segments; s.x = v; m_Renderer.settings.surface.segments = s; m_Renderer.FitCameraToGeometry(); }
|
||||
private void SetSegmentY(int v) { Vector2Int s = m_Renderer.settings.surface.segments; s.y = v; m_Renderer.settings.surface.segments = s; m_Renderer.FitCameraToGeometry(); }
|
||||
private void SetUvOffsetX(float v) { Vector2 u = m_Renderer.settings.surface.uvOffset; u.x = v; m_Renderer.settings.surface.uvOffset = u; }
|
||||
private void SetUvOffsetY(float v) { Vector2 u = m_Renderer.settings.surface.uvOffset; u.y = v; m_Renderer.settings.surface.uvOffset = u; }
|
||||
private void SetUvTileX(float v) { Vector2 u = m_Renderer.settings.surface.uvTiling; u.x = v; m_Renderer.settings.surface.uvTiling = u; }
|
||||
|
||||
@@ -6,7 +6,6 @@ Shader "Hidden/XericUI/ShaderBake/Debug View"
|
||||
{
|
||||
_Mode ("视图(0=UV 1=梯度 2=棋盘)", Float) = 0
|
||||
_LineThickness ("整数边界线宽", Range(1, 400)) = 90
|
||||
_CellMix ("每格色相强度", Range(0, 1)) = 0.22
|
||||
}
|
||||
|
||||
SubShader
|
||||
@@ -28,7 +27,6 @@ Shader "Hidden/XericUI/ShaderBake/Debug View"
|
||||
|
||||
float _Mode;
|
||||
float _LineThickness;
|
||||
float _CellMix;
|
||||
|
||||
struct appdata
|
||||
{
|
||||
@@ -72,11 +70,11 @@ Shader "Hidden/XericUI/ShaderBake/Debug View"
|
||||
return o;
|
||||
}
|
||||
|
||||
// UV 视图:红 = U,绿 = V。角点即 UV,一格四角该是 黑(0,0) 红(1,0) 绿(0,1) 黄(1,1)
|
||||
fixed4 UvView(float2 cell, float2 f)
|
||||
// UV 视图:红 = U,绿 = V。角点即 UV,一格四角该是 黑(0,0) 红(1,0) 绿(0,1) 黄(1,1)。
|
||||
// (0,0) 必须是纯黑——掺了每格色相就分不出哪一头是原点
|
||||
fixed4 UvView(float2 f)
|
||||
{
|
||||
fixed3 col = fixed3(f.x, f.y, 0.06);
|
||||
col = lerp(col, CellHue(cell), _CellMix);
|
||||
fixed3 col = fixed3(f.x, f.y, 0.0);
|
||||
return fixed4(col * EdgeMask(f), 1.0);
|
||||
}
|
||||
|
||||
@@ -115,7 +113,7 @@ Shader "Hidden/XericUI/ShaderBake/Debug View"
|
||||
float2 f = i.uv - cell;
|
||||
|
||||
if (_Mode < 0.5)
|
||||
return UvView(cell, f);
|
||||
return UvView(f);
|
||||
if (_Mode < 1.5)
|
||||
return GradientView(f);
|
||||
return CheckerView(cell, f);
|
||||
|
||||
Reference in New Issue
Block a user