make Expression merger classes internal.

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

@@ -9,7 +9,7 @@ namespace UniVRM10
     /// <summary>
     /// ブレンドシェイプを蓄えてまとめて適用するクラス
     /// </summary>
-    class ExpressionMerger
+    internal class ExpressionMerger
     {
         /// <summary>
         /// Key から Expression を得る
@@ -35,15 +35,6 @@ namespace UniVRM10
             m_materialValueBindingMerger = new MaterialValueBindingMerger(m_clipMap, root);
         }
 
-        /// <summary>
-        /// 蓄積した値を適用する
-        /// </summary>
-        public void Apply()
-        {
-            m_morphTargetBindingMerger.Apply();
-            m_materialValueBindingMerger.Apply();
-        }
-
         /// <summary>
         /// まとめて反映する。1フレームに1回呼び出されることを想定
         /// </summary>
@@ -54,14 +45,12 @@ namespace UniVRM10
             {
                 AccumulateValue(kv.Key, kv.Value);
             }
+            
+            m_morphTargetBindingMerger.Apply();
+            m_materialValueBindingMerger.Apply();
         }
 
-        /// <summary>
-        /// 即時に反映しない。後にApplyによって反映する
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        public void AccumulateValue(ExpressionKey key, float value)
+        private void AccumulateValue(ExpressionKey key, float value)
         {
             m_valueMap[key] = value;
 

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

@@ -7,7 +7,7 @@ namespace UniVRM10
     ///
     /// Base + (A.Target - Base) * A.Weight + (B.Target - Base) * B.Weight ...
     ///
-    class MaterialValueBindingMerger
+    internal class MaterialValueBindingMerger
     {
         #region MaterialMap
         /// <summary>

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

@@ -7,7 +7,7 @@ namespace UniVRM10
     ///
     /// A.Value * A.Weight + B.Value * B.Weight ...
     ///
-    class MorphTargetBindingMerger
+    internal class MorphTargetBindingMerger
     {
         class DictionaryKeyMorphTargetBindingComparer : IEqualityComparer<MorphTargetBinding>
         {

Assets/VRM10/Runtime/Components/VRM10ControllerExpression.cs

@@ -49,7 +49,6 @@ namespace UniVRM10
         public void Apply()
         {
             m_merger.SetValues(m_accumulator.FrameExpression());
-            m_merger.Apply();
         }
     }
 }