From 6ecaef0a6eb90846eb7b6f19d8a4f35263620cf2 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Thu, 9 Sep 2021 19:46:27 +0900
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=80=A4=E3=81=A8=E3=81=AE?=
 =?UTF-8?q?=E5=B7=AE=E5=88=86=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E3=82=92=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Expression/MaterialValueBindingMerger.cs  | 21 ++++++++++++-------
 .../Expression/PreviewMaterialItem.cs         |  5 +++++
 .../VRM10Viewer/VRM10AutoExpression.cs        |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
index f1d8218a0d..857eff7f9d 100644
--- a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
+++ b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
@@ -79,6 +79,7 @@ void InitializeMaterialMap(Dictionary<ExpressionKey, VRM10Expression> clipMap, T
                         item = new PreviewMaterialItem(material);
                         m_materialMap.Add(binding.MaterialName, item);
                     }
+                    // color default value
                     var propName = GetProperty(binding.BindType);
                     if (!item.PropMap.ContainsKey(binding.BindType))
                     {
@@ -148,8 +149,6 @@ public int GetHashCode(MaterialColorBinding obj)
         /// </summary>
         Dictionary<string, Vector4> m_materialUVMap = new Dictionary<string, Vector4>();
 
-        static readonly Vector4 DefaultUVScaleOffset = new Vector4(1, 1, 0, 0);
-
         public void AccumulateValue(VRM10Expression clip, float value)
         {
             // material color
@@ -169,14 +168,20 @@ public void AccumulateValue(VRM10Expression clip, float value)
             // maetrial uv
             foreach (var binding in clip.MaterialUVBindings)
             {
-                Vector4 acc;
-                if (!m_materialUVMap.TryGetValue(binding.MaterialName, out acc))
+                if (m_materialMap.TryGetValue(binding.MaterialName, out PreviewMaterialItem item))
                 {
-                    acc = DefaultUVScaleOffset;
-                }
+                    var delta = binding.ScalingOffset - item.DefaultUVScaleOffset;
 
-                var delta = binding.ScalingOffset - DefaultUVScaleOffset;
-                m_materialUVMap[binding.MaterialName] = acc + delta * value;
+                    Vector4 acc;
+                    if (m_materialUVMap.TryGetValue(binding.MaterialName, out acc))
+                    {
+                        m_materialUVMap[binding.MaterialName] = acc + delta * value;
+                    }
+                    else
+                    {
+                        m_materialUVMap[binding.MaterialName] = item.DefaultUVScaleOffset + delta * value;
+                    }
+                }
             }
         }
 
diff --git a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs
index 20af729b4a..1cecedf22d 100644
--- a/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs
+++ b/Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs
@@ -56,10 +56,15 @@ public sealed class PreviewMaterialItem
         public PreviewMaterialItem(Material material)
         {
             Material = material;
+
+            // uv default value
+            DefaultUVScaleOffset = material.GetVector(UV_PROPERTY);
         }
 
         public Dictionary<UniGLTF.Extensions.VRMC_vrm.MaterialColorType, PropItem> PropMap = new Dictionary<UniGLTF.Extensions.VRMC_vrm.MaterialColorType, PropItem>();
 
+        public Vector4 DefaultUVScaleOffset = new Vector4(1, 1, 0, 0);
+
         public string[] PropNames
         {
             get;
diff --git a/Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs b/Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs
index de1a565eb5..ddedd1a2f1 100644
--- a/Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs
+++ b/Assets/VRM10/Samples/VRM10Viewer/VRM10AutoExpression.cs
@@ -53,7 +53,7 @@ IEnumerator Routine()
             {
                 yield return new WaitForSeconds(1.0f);
 
-                var velocity = 0.1f;
+                var velocity = 0.01f;
 
                 yield return RoutineNest(ExpressionPreset.happy, velocity, m_wait);
                 yield return RoutineNest(ExpressionPreset.angry, velocity, m_wait);