From ceed241abdde737805cbc865c97909e693cfbc94 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 15 Jun 2021 14:16:52 +0900 Subject: [PATCH] avoid editor error if not playing --- .../Expression/VRM10ControllerEditorExpression.cs | 1 + .../Components/VRM10ControllerExpression.cs | 14 ++++---------- .../Runtime/Components/VRM10ControllerRuntime.cs | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Assets/VRM10/Editor/Components/Expression/VRM10ControllerEditorExpression.cs b/Assets/VRM10/Editor/Components/Expression/VRM10ControllerEditorExpression.cs index 4cd6b6b6c..7f0c05630 100644 --- a/Assets/VRM10/Editor/Components/Expression/VRM10ControllerEditorExpression.cs +++ b/Assets/VRM10/Editor/Components/Expression/VRM10ControllerEditorExpression.cs @@ -35,6 +35,7 @@ namespace UniVRM10 if (!Application.isPlaying) { EditorGUILayout.HelpBox("Enable when playing", MessageType.Info); + return; } if (m_sliders != null) diff --git a/Assets/VRM10/Runtime/Components/VRM10ControllerExpression.cs b/Assets/VRM10/Runtime/Components/VRM10ControllerExpression.cs index 755bb7138..ab3c74627 100644 --- a/Assets/VRM10/Runtime/Components/VRM10ControllerExpression.cs +++ b/Assets/VRM10/Runtime/Components/VRM10ControllerExpression.cs @@ -43,23 +43,17 @@ namespace UniVRM10 int m_debugCount; - internal void Setup(Transform transform, ILookAtEyeDirectionProvider eyeDirectionProvider, ILookAtEyeDirectionApplicable eyeDirectionApplicable) + internal void Setup(VRM10Controller target, ILookAtEyeDirectionProvider eyeDirectionProvider, ILookAtEyeDirectionApplicable eyeDirectionApplicable) { - m_expressionAvatar = transform.GetComponent(); + m_expressionAvatar = target.GetComponent(); if (m_expressionAvatar == null) { -#if VRM_DEVELOP - if (m_debugCount++ == 0) - { - Debug.LogWarning($"{nameof(VRM10ControllerExpression)}.{nameof(m_expressionAvatar)} is null."); - } -#endif - return; + throw new ArgumentNullException(); } Restore(); - _merger = new ExpressionMerger(m_expressionAvatar.Clips, transform); + _merger = new ExpressionMerger(m_expressionAvatar.Clips, target.transform); _keys = m_expressionAvatar.Clips.Select(ExpressionKey.CreateFromClip).ToList(); var oldInputWeights = _inputWeights; _inputWeights = _keys.ToDictionary(x => x, x => 0f); diff --git a/Assets/VRM10/Runtime/Components/VRM10ControllerRuntime.cs b/Assets/VRM10/Runtime/Components/VRM10ControllerRuntime.cs index e9362504c..ed5a26e75 100644 --- a/Assets/VRM10/Runtime/Components/VRM10ControllerRuntime.cs +++ b/Assets/VRM10/Runtime/Components/VRM10ControllerRuntime.cs @@ -22,7 +22,7 @@ namespace UniVRM10 } m_head = animator.GetBoneTransform(HumanBodyBones.Head); target.LookAt.Setup(animator, m_head); - target.Expression.Setup(target.transform, target.LookAt, target.LookAt.EyeDirectionApplicable); + target.Expression.Setup(target, target.LookAt, target.LookAt.EyeDirectionApplicable); if (m_constraints == null) {