Merge pull request #824 from malaybaku/develop

v2.0.8
malaybaku · Aug 31, 2022 · 8266b22 · 8266b22
2 parents 1730149 + c725f93
commit 8266b22
Show file tree

Hide file tree

Showing 46 changed files with 661 additions and 206 deletions.
diff --git a/Batches/version.txt b/Batches/version.txt
@@ -1 +1 @@
-v2.0.7
+v2.0.8
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 
 Logo: by [@otama_jacksy](https://twitter.com/otama_jacksy)
 
-v2.0.7
+v2.0.8
 
 * 作成: 獏星(ばくすたー)
-* 2022/07/29
+* 2022/08/31
 
 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.7
+v2.0.8
 
 * Author: Baxter
-* 2022/Jul/29
+* 2022/Aug/31
 
 The VRM avatar application without any special device.
 

diff --git a/VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/AvatarControl/FaceController.prefab b/VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/AvatarControl/FaceController.prefab
@@ -35,7 +35,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3748028267383499194}
   - {fileID: 3752062569261173665}
@@ -170,6 +169,7 @@ MonoBehaviour:
   eyeDownMotionController: {fileID: 4339509367763658613}
   eyeJitter: {fileID: 3748028267383499190}
   externalTrackerEyeJitter: {fileID: 1428360342779558990}
+  blinkAdjust: {fileID: 5356487033938143835}
 --- !u!1 &3748028267383499195
 GameObject:
   m_ObjectHideFlags: 0
@@ -204,7 +204,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3748028266611161172}
   m_RootOrder: 0
@@ -224,7 +223,7 @@ MonoBehaviour:
   changeTimeMin: 0.3
   changeTimeMax: 1
   rateRange: {x: 0.4, y: 0.2}
-  speedFactor: 4
+  speedFactor: 8
 --- !u!114 &4936425215266607946
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -273,7 +272,7 @@ MonoBehaviour:
   headRotThreshold: 25
   headRotResetSpeed: 15
   headRotBlinkProbability: 0.6
-  eyeRotBlinkSpeedThreshold: 18
+  eyeRotRateSpeedThreshold: 0.3
   eyeRotBlinkProbability: 0.8
   lipSyncVisemeThreshold: 0.2
   lipSyncOnCountThreshold: 10
@@ -368,7 +367,6 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3748028266611161172}
   m_RootOrder: 1

diff --git a/VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/AvatarControl/MotionController.prefab b/VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/AvatarControl/MotionController.prefab
@@ -29,7 +29,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 4
@@ -103,7 +102,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 2
@@ -259,7 +257,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 1
@@ -329,7 +326,7 @@ MonoBehaviour:
   eyeSpeedFactor: 4
   motionBlendDuration: 0.5
   keepEyeCenterProbability: 0.5
-  eyeRotationFactor: 0.4
+  eyeRotationRateFactor: 0.05
   eyeOrientationVaryRange: 10
   inactiveFactors: {x: 10, y: 10}
   activeFactors: {x: 10, y: 10}
@@ -374,7 +371,6 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 3
@@ -431,7 +427,6 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 0
@@ -689,6 +684,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5813678810510073683}
   - component: {fileID: 733898353923353159}
+  - component: {fileID: 5470382612402142914}
   m_Layer: 0
   m_Name: MotionController
   m_TagString: Untagged
@@ -706,7 +702,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5813678810404708599}
   - {fileID: 5813678809054739211}
@@ -735,6 +730,19 @@ MonoBehaviour:
   headMotionClipPlayer: {fileID: 3163774597481480951}
   colliderBasedAvatarParamLoader: {fileID: 8229117264469737190}
   nonImageBasedMotion: {fileID: 3373783041301125446}
+--- !u!114 &5470382612402142914
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5813678810510073684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 936b5a492f001084ebc1446b2abe1827, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  updateInterval: 0.12
 --- !u!1 &7492520328184788948
 GameObject:
   m_ObjectHideFlags: 0
@@ -762,7 +770,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 5
@@ -819,7 +826,6 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5813678810510073683}
   m_RootOrder: 6

diff --git a/VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/Core/CoreLogics.prefab b/VMagicMirror/Assets/Baku/VMagicMirror/Prefabs/Core/CoreLogics.prefab
@@ -221,22 +221,22 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: loadSetting.bodyTarget
+      propertyPath: previewCanvas
       value: 
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: loadSetting.leftHandTarget
+      propertyPath: settingAdjuster
       value: 
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: loadSetting.rightHandTarget
+      propertyPath: windowStyleController
       value: 
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: loadSetting.rightIndexTarget
+      propertyPath: loadSetting.bodyTarget
       value: 
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
@@ -246,17 +246,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: previewCanvas
+      propertyPath: loadSetting.leftHandTarget
       value: 
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: windowStyleController
+      propertyPath: loadSetting.rightHandTarget
       value: 
       objectReference: {fileID: 0}
     - target: {fileID: 6312515010370811263, guid: 948e310483123da43ab4787ee2ac6688,
         type: 3}
-      propertyPath: settingAdjuster
+      propertyPath: loadSetting.rightIndexTarget
       value: 
       objectReference: {fileID: 0}
     m_RemovedComponents: []

diff --git a/VMagicMirror/Assets/Baku/VMagicMirror/Scripts/Accessory/AccessoryItem.cs b/VMagicMirror/Assets/Baku/VMagicMirror/Scripts/Accessory/AccessoryItem.cs
@@ -510,8 +510,10 @@ private void UpdateIfBillboard()
                 return;
             }
 
-            var bone = _attachBones[ItemLayout.AttachTarget];
-            if (bone == null)
+            //マイナーケースで「2DアクセサリをWorld固定で最前面表示しようとしている」というのがあり、それをガードしている
+            //これによって描画が崩れる可能性があるが、GUI側で警告を出すことでユーザーに直してもらう想定
+            if (!_attachBones.TryGetValue(ItemLayout.AttachTarget, out var bone) || 
+                bone == null)
             {
                 return;
             }

diff --git a/...irror/Assets/Baku/VMagicMirror/Scripts/AvatarControl/FaceContol/BlendShapeResultSetter.cs b/...irror/Assets/Baku/VMagicMirror/Scripts/AvatarControl/FaceContol/BlendShapeResultSetter.cs
@@ -209,7 +209,7 @@ private void WriteClipsWithInterpolation()
                 }
 
                 neutralClipSettings.ApplyNeutralClip(_blendShape, blendShapeInterpolator.NonMouthWeight);
-                neutralClipSettings.ApplyOffsetClip(_blendShape, blendShapeInterpolator.NonMouthWeight);
+                neutralClipSettings.ApplyOffsetClip(_blendShape);
                 return;
             }
 
@@ -221,7 +221,7 @@ private void WriteClipsWithInterpolation()
             lipSync.Accumulate(_blendShape, blendShapeInterpolator.MouthWeight);
 
             neutralClipSettings.ApplyNeutralClip(_blendShape, blendShapeInterpolator.NonMouthWeight);
-            neutralClipSettings.ApplyOffsetClip(_blendShape, blendShapeInterpolator.NonMouthWeight);
+            neutralClipSettings.ApplyOffsetClip(_blendShape);
         }
     }
 }