From 4300bcf9a6365b0875678ec738eb2beb3cddeeab Mon Sep 17 00:00:00 2001 From: Emiliana <38952746+emilianavt@users.noreply.github.com> Date: Fri, 3 Jul 2020 17:45:49 +0200 Subject: [PATCH] Switched to using "Blink" instead of "Blink_L" and "Blink_R" for blinking both eyes. --- Examples/OpenSeeVRMDriver.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Examples/OpenSeeVRMDriver.cs b/Examples/OpenSeeVRMDriver.cs index 15b94e4..eb6f7a0 100644 --- a/Examples/OpenSeeVRMDriver.cs +++ b/Examples/OpenSeeVRMDriver.cs @@ -1012,13 +1012,10 @@ public class OpenSeeVRMDriver : MonoBehaviour { void BlinkEyes() { if (vrmBlendShapeProxy == null || eyeBlinker == null) return; - vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_R), 0f); - vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_L), 0f); if (autoBlink) { if (currentExpressionEnableBlinking) { float blink = eyeBlinker.Blink(); - vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_R), blink); - vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_L), blink); + vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink), blink); } } else if (openSeeExpression != null && openSeeExpression.openSee != null) { if (!currentExpressionEnableBlinking) @@ -1088,12 +1085,11 @@ public class OpenSeeVRMDriver : MonoBehaviour { if (linkBlinks) { float v = Mathf.Max(left, right); - left = v; - right = v; + vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink), v); + } else { + vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_R), right); + vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_L), left); } - - vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_R), right); - vrmBlendShapeProxy.AccumulateValue(new BlendShapeKey(BlendShapePreset.Blink_L), left); } }