Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-09 12:29:23 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix MaterialValueBindingMerger built-in RP lock-in

Browse Source
This commit is contained in:
notargs
2024-12-13 20:20:28 +09:00
parent 264a6bcf78
commit fc206b8225
1 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
View File

@@ -231,29 +231,6 @@ namespace UniVRM10
}
}
// UVアクセスするテクスチャーのScaleOffsetプロパティの一覧
static Dictionary<string, string[]> UVPropMap = new Dictionary<string, string[]>
{
{"Standard", new string[]{
"_MainTex_ST",
}},
{"VRM10/MToon10", new string[]{
"_MainTex_ST",
}},
};
static string[] DefaultProps = { "_MainTex_ST" };
public static String[] GetUVProps(string shaderName)
{
if (UVPropMap.TryGetValue(shaderName, out string[] props))
{
return props;
}
else
{
return DefaultProps;
}
}
HashSet<MaterialTarget> m_used = new HashSet<MaterialTarget>();
public void Apply()
{
@@ -302,10 +279,8 @@ namespace UniVRM10
//
// Standard and MToon use _MainTex_ST as uv0 scale/offset
//
foreach (var prop in GetUVProps(item.Material.shader.name))
{
item.Material.SetVector(prop, kv.Value);
}
item.Material.mainTextureScale = new Vector2(kv.Value.x, kv.Value.y);
item.Material.mainTextureOffset = new Vector2(kv.Value.z, kv.Value.w);
}
}
m_materialUVMap.Clear();