diff --git a/Editor/ShaderBake/BakeShaderAsImageWindow.cs b/Editor/ShaderBake/BakeShaderAsImageWindow.cs index c963fd7..3cf5e70 100644 --- a/Editor/ShaderBake/BakeShaderAsImageWindow.cs +++ b/Editor/ShaderBake/BakeShaderAsImageWindow.cs @@ -633,8 +633,8 @@ namespace XericUI.ShaderBake.Editor private void SetFaceFieldsEnabled(bool enabled) { - IntegerField x = rootVisualElement.Q("face-uv-x"); - IntegerField y = rootVisualElement.Q("face-uv-y"); + VisualElement x = rootVisualElement.Q("face-uv-x"); + VisualElement y = rootVisualElement.Q("face-uv-y"); if (x != null) x.SetEnabled(enabled); if (y != null) y.SetEnabled(enabled); } @@ -856,18 +856,27 @@ namespace XericUI.ShaderBake.Editor // ── 通用绑定 ──────────────────────────────────────────── + /* + * 一律按名字取元素、再按 INotifyValueChanged 绑定,而不是 Q 之类。 + * 同名的数字输入框在 2021.3 / 2022.1 分属 UnityEditor.UIElements 与 UnityEngine.UIElements, + * 按具体类型 Q 一旦落在另一侧就取不到:表现是数值永远空白,而且当时不一定有显眼报错。 + */ + private void BindFloat(string name, Func get, Action set) { - FloatField field = rootVisualElement.Q(name); - if (field == null) + VisualElement field = rootVisualElement.Q(name); + var target = field as INotifyValueChanged; + if (target == null) { - Debug.LogError("[ShaderBake] UXML 里缺控件 " + name); + Debug.LogError("[ShaderBake] UXML 里缺数值控件 " + name); return; } // 延迟提交:一边打字一边回写会把光标和"0."这类中间输入搅乱,等回车/失焦再收 - field.isDelayed = true; - m_Syncers.Add(() => field.SetValueWithoutNotify(get())); - field.RegisterValueChangedCallback(evt => + var delayedTarget = field as TextInputBaseField; + if (delayedTarget != null) + delayedTarget.isDelayed = true; + m_Syncers.Add(() => target.SetValueWithoutNotify(get())); + field.RegisterCallback>(evt => { set(evt.newValue); Commit(); @@ -876,15 +885,18 @@ namespace XericUI.ShaderBake.Editor private void BindInt(string name, Func get, Action set) { - IntegerField field = rootVisualElement.Q(name); - if (field == null) + VisualElement field = rootVisualElement.Q(name); + var target = field as INotifyValueChanged; + if (target == null) { - Debug.LogError("[ShaderBake] UXML 里缺控件 " + name); + Debug.LogError("[ShaderBake] UXML 里缺整数控件 " + name); return; } - field.isDelayed = true; - m_Syncers.Add(() => field.SetValueWithoutNotify(get())); - field.RegisterValueChangedCallback(evt => + var delayedTarget = field as TextInputBaseField; + if (delayedTarget != null) + delayedTarget.isDelayed = true; + m_Syncers.Add(() => target.SetValueWithoutNotify(get())); + field.RegisterCallback>(evt => { set(evt.newValue); Commit(); @@ -893,14 +905,15 @@ namespace XericUI.ShaderBake.Editor private void BindBool(string name, Func get, Action set) { - Toggle field = rootVisualElement.Q(name); - if (field == null) + VisualElement field = rootVisualElement.Q(name); + var target = field as INotifyValueChanged; + if (target == null) { - Debug.LogError("[ShaderBake] UXML 里缺控件 " + name); + Debug.LogError("[ShaderBake] UXML 里缺开关 " + name); return; } - m_Syncers.Add(() => field.SetValueWithoutNotify(get())); - field.RegisterValueChangedCallback(evt => + m_Syncers.Add(() => target.SetValueWithoutNotify(get())); + field.RegisterCallback>(evt => { set(evt.newValue); Commit(); @@ -909,14 +922,15 @@ namespace XericUI.ShaderBake.Editor private void BindColor(string name, Func get, Action set) { - ColorField field = rootVisualElement.Q(name); - if (field == null) + VisualElement field = rootVisualElement.Q(name); + var target = field as INotifyValueChanged; + if (target == null) { - Debug.LogError("[ShaderBake] UXML 里缺控件 " + name); + Debug.LogError("[ShaderBake] UXML 里缺颜色控件 " + name); return; } - m_Syncers.Add(() => field.SetValueWithoutNotify(get())); - field.RegisterValueChangedCallback(evt => + m_Syncers.Add(() => target.SetValueWithoutNotify(get())); + field.RegisterCallback>(evt => { set(evt.newValue); Commit(); diff --git a/Editor/ShaderBake/BakeShaderWindow.uss b/Editor/ShaderBake/BakeShaderWindow.uss index f060adf..710b822 100644 --- a/Editor/ShaderBake/BakeShaderWindow.uss +++ b/Editor/ShaderBake/BakeShaderWindow.uss @@ -127,6 +127,7 @@ } .detail-pane > .unity-scroll-view__content-container { + width: 100%; flex-shrink: 0; } @@ -167,9 +168,14 @@ min-width: 0; } +/* + * flex-basis: 0 是关键:默认 auto 会按内容宽度(标题 + 输入框)定基宽, + * 一行两栏/三栏加起来必然超过侧栏宽度,输入框被挤到可视区外——表现就是"数值文本不显示"。 + */ .field-half { flex-grow: 1; flex-shrink: 1; + flex-basis: 0; min-width: 0; margin-right: 4px; } @@ -177,6 +183,7 @@ .field-third { flex-grow: 1; flex-shrink: 1; + flex-basis: 0; min-width: 0; margin-right: 4px; } @@ -184,11 +191,28 @@ .field-quarter { flex-grow: 1; flex-shrink: 1; + flex-basis: 0; min-width: 0; margin-right: 3px; font-size: 10px; } +/* 2021.3 的字段标题默认吃 120px 左右,窄栏里会把输入区压没;侧栏内统一收窄 */ +.detail-content .unity-base-field__label, +.detail-content .unity-text-field__label, +.detail-content .unity-base-text-field__label { + min-width: 30px; + flex-shrink: 1; + overflow: hidden; +} + +.detail-content .unity-base-field__input, +.detail-content .unity-text-field__input, +.detail-content .unity-base-text-field__input { + flex-shrink: 1; + min-width: 0; +} + /* ── 浏览图里的选中面片高亮 ── */ .face-overlay { position: absolute; diff --git a/Editor/ShaderBake/BakeShaderWindow.uxml b/Editor/ShaderBake/BakeShaderWindow.uxml index bdca115..a3c4105 100644 --- a/Editor/ShaderBake/BakeShaderWindow.uxml +++ b/Editor/ShaderBake/BakeShaderWindow.uxml @@ -86,9 +86,9 @@ - + - + @@ -102,8 +102,8 @@ - - + + @@ -152,8 +152,8 @@ - - + + diff --git a/Runtime/ShaderBake/ShaderBakeCameraSettings.cs b/Runtime/ShaderBake/ShaderBakeCameraSettings.cs index e742d46..dd7faf0 100644 --- a/Runtime/ShaderBake/ShaderBakeCameraSettings.cs +++ b/Runtime/ShaderBake/ShaderBakeCameraSettings.cs @@ -31,10 +31,21 @@ namespace XericUI.ShaderBake [Tooltip("相机旋转(欧拉角,度):默认朝 +Z 看,即看着放在原点、面朝 -Z 的面片")] public Vector3 eulerAngles; - /// 视口(世界 → 相机)矩阵 + /// + /// 视口(世界 → 相机)矩阵。 + /// + /// 为什么要镜像 Z: 与 + /// 沿用 OpenGL 约定——相机朝 -Z 看;而 TRS(...).inverse 给出的是 Unity 自己的 + /// "朝 +Z 看"。两者直接拼起来,正前方的物体会得到负的裁剪 w(透视)或落在近远裁剪面之外(正交), + /// 整块几何被裁光,表现就是"渲染成功但画面全透明"。 + /// public Matrix4x4 viewMatrix { - get { return Matrix4x4.TRS(position, Quaternion.Euler(eulerAngles), Vector3.one).inverse; } + get + { + Matrix4x4 worldToLocal = Matrix4x4.TRS(position, Quaternion.Euler(eulerAngles), Vector3.one).inverse; + return Matrix4x4.Scale(new Vector3(1f, 1f, -1f)) * worldToLocal; + } } ///