MaterialColorBindings の重複時の例外防止

Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs

@@ -80,11 +80,14 @@ void InitializeMaterialMap(Dictionary<ExpressionKey, VRM10Expression> clipMap, T
                         m_materialMap.Add(binding.MaterialName, item);
                     }
                     var propName = GetProperty(binding.BindType);
-                    item.PropMap.Add(binding.BindType, new PropItem
+                    if (!item.PropMap.ContainsKey(binding.BindType))
                     {
-                        Name = propName,
-                        DefaultValues = item.Material.GetVector(propName),
-                    });
+                        item.PropMap.Add(binding.BindType, new PropItem
+                        {
+                            Name = propName,
+                            DefaultValues = item.Material.GetVector(propName),
+                        });
+                    }
                 }
 
                 foreach (var binding in kv.Value.MaterialUVBindings)

Assets/VRM10/Runtime/Components/VRM10Controller/VRM10ControllerRuntime.cs

@@ -6,7 +6,7 @@ namespace UniVRM10
     /// <summary>
     /// Play時 と Editorからの参照情報置き場
     /// </summary>
-    class VRM10ControllerRuntime
+    public class VRM10ControllerRuntime
     {
         VRM10Controller m_target;
         VRM10Constraint[] m_constraints;

Assets/VRM10/Tests/ExpressionTests.cs

@@ -0,0 +1,87 @@
+using System.IO;
+using System.Linq;
+using NUnit.Framework;
+using UnityEngine;
+
+namespace UniVRM10.Test
+{
+    public class ExpressionTests
+    {
+        static string AliciaPath
+        {
+            get
+            {
+                return Path.GetFullPath(Application.dataPath + "/../Tests/Models/Alicia_vrm-0.51/AliciaSolid_vrm-0.51.vrm")
+                    .Replace("\\", "/");
+            }
+        }
+
+        static VRM10Controller Load()
+        {
+            Vrm10Data.TryParseOrMigrate(AliciaPath, true, out Vrm10Data vrm);
+            using (var loader = new Vrm10Importer(vrm))
+            {
+                var task = loader.LoadAsync(new VRMShaders.ImmediateCaller());
+                task.Wait();
+
+                var instance = task.Result;
+
+                return instance.GetComponent<VRM10Controller>();
+            }
+
+        }
+
+        [Test]
+        public void DuplicatedMaterialColorBindings()
+        {
+            var controller = Load();
+
+            var src = controller.Vrm.Expression.Aa.MaterialColorBindings.ToList();
+
+            var renderers = controller.GetComponentsInChildren<Renderer>();
+            var name = renderers[0].sharedMaterials[0].name;
+
+            // add duplicate key
+            src.Add(new MaterialColorBinding
+            {
+                BindType = UniGLTF.Extensions.VRMC_vrm.MaterialColorType.color,
+                MaterialName = name,
+                TargetValue = default,
+            });
+            src.Add(new MaterialColorBinding
+            {
+                BindType = UniGLTF.Extensions.VRMC_vrm.MaterialColorType.color,
+                MaterialName = name,
+                TargetValue = default,
+            });
+            controller.Vrm.Expression.Aa.MaterialColorBindings = src.ToArray();
+
+            // ok if no exception
+            var r = new VRM10ControllerRuntime(controller);
+        }
+
+        [Test]
+        public void DuplicatedMaterialUVBindings()
+        {
+            var controller = Load();
+
+            var renderers = controller.GetComponentsInChildren<Renderer>();
+            var name = renderers[0].sharedMaterials[0].name;
+
+            // add duplicate key
+            var src = controller.Vrm.Expression.Aa.MaterialUVBindings.ToList();
+            src.Add(new MaterialUVBinding
+            {
+                MaterialName = name,
+            });
+            src.Add(new MaterialUVBinding
+            {
+                MaterialName = name,
+            });
+            controller.Vrm.Expression.Aa.MaterialUVBindings = src.ToArray();
+
+            // ok if no exception
+            var r = new VRM10ControllerRuntime(controller);
+        }
+    }
+}