From 27a67b0962f610471b2824f2ac71e2b05bb084f8 Mon Sep 17 00:00:00 2001 From: LiRuoChen <571244399@qq.com> Date: Sat, 7 Nov 2026 10:37:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(ShaderBake):=20=E6=8C=82=E4=B8=8A=20shader?= =?UTF-8?q?=20=E5=90=8E=E6=8A=8A=E5=B1=9E=E6=80=A7=E5=80=BC=E5=86=8D?= =?UTF-8?q?=E5=86=99=E4=B8=80=E9=81=8D=E6=9D=90=E8=B4=A8=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 界面上的值来自材质本身,但"存进材质"和"真的绑到 shader 上"不是一回事: 换过 shader(或 shader 刚重新编译)时,材质里记的值和显卡上的绑定可能对不上, 表现就是界面写着 1、shader 里却是 0,非得手动改一下参数才生效。 刷新属性表时把每一项按原值再写一次,勾选类属性顺手 EnableKeyword/DisableKeyword, 换 shader 也就等于按新 shader 的默认值重新铺一遍。 --- Editor/ShaderBake/ShaderBakePropertyTable.cs | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Editor/ShaderBake/ShaderBakePropertyTable.cs b/Editor/ShaderBake/ShaderBakePropertyTable.cs index bdc3a33..9f43221 100644 --- a/Editor/ShaderBake/ShaderBakePropertyTable.cs +++ b/Editor/ShaderBake/ShaderBakePropertyTable.cs @@ -126,6 +126,7 @@ namespace XericUI.ShaderBake.Editor try { FillFromMaterial(row); + Reapply(row); } finally { @@ -134,6 +135,53 @@ namespace XericUI.ShaderBake.Editor } } + /// + /// 把值原样再写一遍材质。 + /// + /// 值本身没变,但"写一次"和"只是存在材质里"对显卡不是一回事: + /// 刚换过 shader(或 shader 刚重新编译完)时,材质里记的值和 GPU 上的绑定可能对不上, + /// 表现就是界面上明明写着 1,shader 里却是 0,非要手动改一下参数才生效。 + /// + /// 勾选类属性([Toggle]/[KeywordEnum])还要顺手同步关键字—— + /// 关键字没开的时候,shader 里那段分支根本不会走,同样表现为"没反应"。 + /// + private void Reapply(Row row) + { + if (m_Material == null || !m_Material.HasProperty(row.propName)) + return; + + switch (row.propType) + { + case ShaderPropertyType.Color: + m_Material.SetColor(row.propName, m_Material.GetColor(row.propName)); + break; + case ShaderPropertyType.Vector: + m_Material.SetVector(row.propName, m_Material.GetVector(row.propName)); + break; + case ShaderPropertyType.Texture: + m_Material.SetTexture(row.propName, m_Material.GetTexture(row.propName)); + break; + case ShaderPropertyType.Int: + int intValue = m_Material.GetInt(row.propName); + m_Material.SetInt(row.propName, intValue); + SyncKeyword(row, intValue != 0); + break; + default: + float value = m_Material.GetFloat(row.propName); + m_Material.SetFloat(row.propName, value); + SyncKeyword(row, !Mathf.Approximately(value, 0f)); + break; + } + } + + private void SyncKeyword(Row row, bool on) + { + if (row.keyword == null) + return; + if (on) m_Material.EnableKeyword(row.keyword); + else m_Material.DisableKeyword(row.keyword); + } + public void Dispose() { m_Rows.Clear();