Merge pull request #1209 from ousttrue/feature10/expression_uv_scale_…

…offset_update 初期値との差分を使うようにロジックを変更
vrm-c · Sep 9, 2021 · 80a45ef · 80a45ef
2 parents 64af0d2 + 6ecaef0
commit 80a45ef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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);