Merge pull request #854 from malaybaku/develop

v2.0.11
malaybaku · Oct 19, 2022 · 931bc96 · 931bc96
2 parents bfed3b7 + b192d15
commit 931bc96
Show file tree

Hide file tree

Showing 17 changed files with 10,083 additions and 20 deletions.
diff --git a/Batches/version.txt b/Batches/version.txt
@@ -1 +1 @@
-v2.0.10
+v2.0.11
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 
 Logo: by [@otama_jacksy](https://twitter.com/otama_jacksy)
 
-v2.0.10
+v2.0.11
 
 * 作成: 獏星(ばくすたー)
-* 2022/09/30
+* 2022/10/18
 
 WindowsでVRMを表示し、追加のデバイスなしで動かせるアプリケーションです。
 

diff --git a/README_en.md b/README_en.md
@@ -5,10 +5,10 @@
 
 Logo: by [@otama_jacksy](https://twitter.com/otama_jacksy)
 
-v2.0.10
+v2.0.11
 
 * Author: Baxter
-* 2022/Sep/30
+* 2022/Oct/18
 
 The VRM avatar application without any special device.
 

diff --git a/...icMirror/Assets/Baku/VMagicMirror/Scripts/AvatarControl/FaceContol/NeutralClipSettings.cs b/...icMirror/Assets/Baku/VMagicMirror/Scripts/AvatarControl/FaceContol/NeutralClipSettings.cs
@@ -40,17 +40,15 @@ public void ApplyNeutralClip(VRMBlendShapeProxy proxy, float weight = 1f)
         {
             if (HasValidNeutralClipKey)
             {
-                //NOTE: 他の処理と被って値が1を超えるのを避けておく、一応
-                proxy.AccumulateValue(NeutralClipKey, Mathf.Min(weight, 1f - proxy.GetValue(NeutralClipKey)));
+                proxy.AccumulateValue(NeutralClipKey, weight);
             }
         }
 
         public void ApplyOffsetClip(VRMBlendShapeProxy proxy)
         {
             if (HasValidOffsetClipKey)
             {
-                //NOTE: 他の処理と被って値が1を超えるのを避けておく、一応
-                proxy.AccumulateValue(OffsetClipKey, 1f - proxy.GetValue(OffsetClipKey));
+                proxy.AccumulateValue(OffsetClipKey, 1f);
             }
         }
 

diff --git a/...rror/Assets/Baku/VMagicMirror/Scripts/AvatarControl/WordToMotion/V2/WordToMotionRunner.cs b/...rror/Assets/Baku/VMagicMirror/Scripts/AvatarControl/WordToMotion/V2/WordToMotionRunner.cs
@@ -135,7 +135,11 @@ public void Run(MotionRequest request)
             if (request.UseBlendShape)
             {
                 _blendShapeResetCts = new CancellationTokenSource();
-                ResetBlendShapeAsync(duration, _blendShapeResetCts.Token).Forget(); 
+                //NOTE: HoldBlendShape == falseの場合、必ず有効なdurationが入ってるはず
+                if (!request.HoldBlendShape)
+                {
+                    ResetBlendShapeAsync(duration, _blendShapeResetCts.Token).Forget();
+                }
             }
 
             //アクセサリの処理

diff --git a/VMagicMirror/Assets/Fonts.meta b/VMagicMirror/Assets/Fonts.meta