Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-25 03:55:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

implement LookAt

Browse Source
This commit is contained in:
ousttrue
2021-04-01 13:46:52 +09:00
parent 5df1576a70
commit c3fc7797ec
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Assets/VRM10/Runtime/Components/VRM10ControllerLookAt.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using VrmLib;
using UniGLTF.Extensions.VRMC_vrm;
#if UNITY_EDITOR
using UnityEditor;
#endif
@@ -11,14 +10,6 @@ namespace UniVRM10
[Serializable]
public class VRM10ControllerLookAt : ILookAtEyeDirectionProvider
{
public enum LookAtTypes
{
// Gaze control by bone (leftEye, rightEye)
Bone,
// Gaze control by blend shape (lookUp, lookDown, lookLeft, lookRight)
Expression,
}
public enum LookAtTargetTypes
{
CalcYawPitchToGaze,
@@ -32,7 +23,7 @@ namespace UniVRM10
public Vector3 OffsetFromHead = new Vector3(0, 0.06f, 0);
[SerializeField]
public LookAtTypes LookAtType;
public LookAtType LookAtType;
[SerializeField]
public CurveMapper HorizontalOuter = new CurveMapper(90.0f, 10.0f);
@@ -55,7 +46,7 @@ namespace UniVRM10
private ILookAtEyeDirectionApplicable _eyeDirectionApplicable;
internal ILookAtEyeDirectionApplicable EyeDirectionApplicable => _eyeDirectionApplicable;
public LookAtEyeDirection EyeDirection { get; private set; }
#region LookAtTargetTypes.CalcYawPitchToGaze
@@ -150,10 +141,10 @@ namespace UniVRM10
}
switch (LookAtType)
{
case LookAtTypes.Bone:
case LookAtType.bone:
_eyeDirectionApplicable = new LookAtEyeDirectionApplicableToBone(m_leftEye, m_rightEye, HorizontalOuter, HorizontalInner, VerticalDown, VerticalUp);
break;
case LookAtTypes.Expression:
case LookAtType.expression:
_eyeDirectionApplicable = new LookAtEyeDirectionApplicableToExpression(HorizontalOuter, HorizontalInner, VerticalDown, VerticalUp);
break;
default:

17
Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs
View File

@@ -251,8 +251,6 @@ namespace UniVRM10
}
}
// firstPerson
// expression
if (m_vrm.Expressions != null)
{
@@ -288,6 +286,21 @@ namespace UniVRM10
}
// lookat
if (m_vrm.LookAt != null)
{
var src = m_vrm.LookAt;
controller.LookAt = new VRM10ControllerLookAt
{
LookAtType = src.LookAtType,
HorizontalInner = new CurveMapper(src.LookAtHorizontalInner.InputMaxValue.Value, src.LookAtHorizontalInner.OutputScale.Value),
HorizontalOuter = new CurveMapper(src.LookAtHorizontalOuter.InputMaxValue.Value, src.LookAtHorizontalOuter.OutputScale.Value),
VerticalUp = new CurveMapper(src.LookAtVerticalUp.InputMaxValue.Value, src.LookAtHorizontalOuter.OutputScale.Value),
VerticalDown = new CurveMapper(src.LookAtVerticalDown.InputMaxValue.Value, src.LookAtHorizontalOuter.OutputScale.Value),
};
controller.LookAt.OffsetFromHead = new Vector3(src.OffsetFromHeadBone[0], src.OffsetFromHeadBone[1], src.OffsetFromHeadBone[2]);
}
// firstPerson
// springBone