Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-21 14:37:49 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Gaze to VRM10Controller

Browse Source
This commit is contained in:
ousttrue 2021-06-16 15:00:02 +09:00
parent 872a0ddc97
commit 8a01eae5f1
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/VRM10.Samples/Runtime/ViewerUI.cs
View File

@ -390,7 +390,8 @@ namespace UniVRM10.Samples
m_lipSync = go.AddComponent<AIUEO>();
m_blink = go.AddComponent<Blinker>();
m_controller.Vrm.LookAt.Gaze = m_target.transform;
m_controller.LookAtTargetType = VRM10ControllerLookAt.LookAtTargetTypes.CalcYawPitchToGaze;
m_controller.Gaze = m_target.transform;
}
}

2
Assets/VRM10/Editor/Components/LookAt/LookAtEditor.cs
View File

@ -30,7 +30,7 @@ namespace UniVRM10
}
else
{
target.Vrm.LookAt.OnSceneGUILookAt(head);
target.Vrm.LookAt.OnSceneGUILookAt(head, target.LookAtTargetType, target.Gaze);
}
}

9
Assets/VRM10/Runtime/Components/VRM10Controller.cs
View File

@ -28,6 +28,15 @@ namespace UniVRM10
[SerializeField]
public Transform SpringBoneCenter;
/// <summay>
/// LookAtTargetTypes.CalcYawPitchToGaze時の注視点
/// </summary>
[SerializeField]
public Transform Gaze;
[SerializeField]
public VRM10ControllerLookAt.LookAtTargetTypes LookAtTargetType;
[SerializeField, Header("VRM1")]
public VRM10Object Vrm;

4
Assets/VRM10/Runtime/Components/VRM10ControllerRuntime.cs
View File

@ -21,7 +21,7 @@ namespace UniVRM10
throw new Exception();
}
m_head = animator.GetBoneTransform(HumanBodyBones.Head);
target.Vrm.LookAt.Setup(animator, m_head);
target.Vrm.LookAt.Setup(animator, m_head, target.LookAtTargetType, target.Gaze);
target.Vrm.Expression.Setup(target, target.Vrm.LookAt, target.Vrm.LookAt.EyeDirectionApplicable);
if (m_constraints == null)
@ -57,7 +57,7 @@ namespace UniVRM10
//
// gaze control
//
m_target.Vrm.LookAt.Process();
m_target.Vrm.LookAt.Process(m_target.LookAtTargetType, m_target.Gaze);
//
// expression

45
Assets/VRM10/Runtime/Components/VRM10Object/VRM10ControllerLookAt.cs
View File

@ -37,9 +37,6 @@ namespace UniVRM10
[SerializeField]
public CurveMapper VerticalUp = new CurveMapper(90.0f, 10.0f);
[SerializeField]
public LookAtTargetTypes LookAtTargetType;
private Transform m_head;
private Transform m_leftEye;
private Transform m_rightEye;
@ -50,12 +47,6 @@ namespace UniVRM10
public LookAtEyeDirection EyeDirection { get; private set; }
#region LookAtTargetTypes.CalcYawPitchToGaze
/// <summay>
/// LookAtTargetTypes.CalcYawPitchToGaze時の注視点
/// </summary>
[SerializeField]
public Transform Gaze;
// 座標計算用のempty
Transform m_lookAtOrigin;
Transform GetLookAtOrigin(Transform head)
@ -106,13 +97,13 @@ namespace UniVRM10
/// LookAtTargetType に応じた yaw, pitch を得る
/// </summary>
/// <returns>Headボーンのforwardに対するyaw角(度), pitch角(度)</returns>
private (float, float) GetLookAtYawPitch(Transform head)
private (float, float) GetLookAtYawPitch(Transform head, LookAtTargetTypes lookAtTargetType, Transform gaze)
{
switch (LookAtTargetType)
switch (lookAtTargetType)
{
case LookAtTargetTypes.CalcYawPitchToGaze:
// Gaze(Transform)のワールド位置に対して計算する
return CalcLookAtYawPitch(Gaze.position, head);
return CalcLookAtYawPitch(gaze.position, head);
case LookAtTargetTypes.SetYawPitch:
// 事前にSetYawPitchした値を使う
@ -122,7 +113,7 @@ namespace UniVRM10
throw new NotImplementedException();
}
internal void Setup(Animator animator, Transform head)
internal void Setup(Animator animator, Transform head, LookAtTargetTypes lookAtTargetType, Transform gaze)
{
m_head = head;
m_leftEye = animator.GetBoneTransform(HumanBodyBones.LeftEye);
@ -132,12 +123,12 @@ namespace UniVRM10
#if UNITY_EDITOR
isRuntimeAsset = Application.isPlaying && !PrefabUtility.IsPartOfAnyPrefab(m_head);
#endif
if (isRuntimeAsset && LookAtTargetType == LookAtTargetTypes.CalcYawPitchToGaze && Gaze == null)
if (isRuntimeAsset && lookAtTargetType == LookAtTargetTypes.CalcYawPitchToGaze && gaze == null)
{
Gaze = new GameObject().transform;
Gaze.name = "__LOOKAT_GAZE__";
Gaze.SetParent(m_head);
Gaze.localPosition = Vector3.forward;
gaze = new GameObject().transform;
gaze.name = "__LOOKAT_GAZE__";
gaze.SetParent(m_head);
gaze.localPosition = Vector3.forward;
}
switch (LookAtType)
{
@ -152,9 +143,9 @@ namespace UniVRM10
}
}
public void Process()
public void Process(LookAtTargetTypes lookAtTargetType, Transform gaze)
{
var (yaw, pitch) = GetLookAtYawPitch(m_head);
var (yaw, pitch) = GetLookAtYawPitch(m_head, lookAtTargetType, gaze);
EyeDirection = new LookAtEyeDirection(yaw, pitch, 0, 0);
}
@ -188,28 +179,28 @@ namespace UniVRM10
const float RADIUS = 0.5f;
public void OnSceneGUILookAt(Transform head)
public void OnSceneGUILookAt(Transform head, LookAtTargetTypes lookAtTargetType, Transform gaze)
{
if (head == null) return;
if (!DrawGizmo) return;
if (Gaze != null)
if (gaze != null)
{
{
EditorGUI.BeginChangeCheck();
var newTargetPosition = Handles.PositionHandle(Gaze.position, Quaternion.identity);
var newTargetPosition = Handles.PositionHandle(gaze.position, Quaternion.identity);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject(Gaze, "Change Look At Target Position");
Gaze.position = newTargetPosition;
Undo.RecordObject(gaze, "Change Look At Target Position");
gaze.position = newTargetPosition;
}
}
Handles.color = new Color(1, 1, 1, 0.6f);
Handles.DrawDottedLine(GetLookAtOrigin(head).position, Gaze.position, 4.0f);
Handles.DrawDottedLine(GetLookAtOrigin(head).position, gaze.position, 4.0f);
}
var (yaw, pitch) = GetLookAtYawPitch(head);
var (yaw, pitch) = GetLookAtYawPitch(head, lookAtTargetType, gaze);
var lookAtOriginMatrix = GetLookAtOrigin(head).localToWorldMatrix;
Handles.matrix = lookAtOriginMatrix;
var p = OffsetFromHead;