diff --git a/Runtime/ShaderBake/ShaderBakeCameraSettings.cs b/Runtime/ShaderBake/ShaderBakeCameraSettings.cs index 4fba233..1aaa949 100644 --- a/Runtime/ShaderBake/ShaderBakeCameraSettings.cs +++ b/Runtime/ShaderBake/ShaderBakeCameraSettings.cs @@ -14,7 +14,7 @@ namespace XericUI.ShaderBake public bool orthographic = true; [Tooltip("正交半高(世界单位):实际能看到的竖向范围是它的两倍")] - public float orthographicSize = 0.6f; + public float orthographicSize = 0.5f; [Tooltip("透视相机的竖向视野角(度),正交时忽略")] public float fieldOfView = 60f; @@ -31,6 +31,17 @@ namespace XericUI.ShaderBake [Tooltip("相机旋转(欧拉角,度):默认朝 +Z 看,即看着放在原点、面朝 -Z 的面片")] public Vector3 eulerAngles; + /// + /// 这份相机参数是按哪一版"框住"约定算出来的。 + /// + /// 早先的"框住"框的是整个网格、还带 15% 余量,画面里于是留了一圈空白; + /// 宽度约定改成刚好铺满之后,读到的旧存档会在开窗时重框一次。 + /// 只认大于等于 的存档,所以老配置只被纠正一次。 + /// + public int fitRevision; + + public const int kCurrentFitRevision = 1; + /// /// 视口(世界 → 相机)矩阵。 /// diff --git a/Runtime/ShaderBake/ShaderBakeRenderer.cs b/Runtime/ShaderBake/ShaderBakeRenderer.cs index 38d6d4a..438b0b2 100644 --- a/Runtime/ShaderBake/ShaderBakeRenderer.cs +++ b/Runtime/ShaderBake/ShaderBakeRenderer.cs @@ -154,7 +154,9 @@ namespace XericUI.ShaderBake EnsureGeometry(); if (m_Geometry == null) return; - settings.camera.FrameBounds(geometryBounds, settings.aspect); + // 余量给 1:烘出来的图和场景里"把材质贴在面片上正对着看"是一个范围,不留白边 + settings.camera.FrameBounds(geometryBounds, settings.aspect, 1f); + settings.camera.fitRevision = ShaderBakeCameraSettings.kCurrentFitRevision; } /// @@ -172,6 +174,7 @@ namespace XericUI.ShaderBake return false; // padding 给 1:这一格就是要铺满整张输出图,留边就等于把内容缩小 settings.camera.FrameBounds(bounds, settings.aspect, 1f); + settings.camera.fitRevision = ShaderBakeCameraSettings.kCurrentFitRevision; return true; }