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();