Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-10 12:59:17 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update VRM10ControllerExpression

Browse Source
This commit is contained in:
ousttrue
2021-01-22 23:26:13 +09:00
parent 5fd62ce61a
commit 9c56c7561c
3 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,20 +137,15 @@ namespace UniVRM10
//
SpringBone.Process();
//
// expression
//
var validateState = Expression.Begin();
//
// gaze control
//
LookAt.Process(Head, Expression.SetPresetValue, validateState.ignoreLookAt);
LookAt.Process(Head, Expression.SetPresetValue);
//
// expression
//
Expression.End(validateState);
Expression.Apply();
}
private void Update()

61
Assets/VRM10/Runtime/Components/VRM10ControllerExpression.cs
View File

@@ -50,6 +50,8 @@ namespace UniVRM10
expressionKeyWeights = m_merger.ExpressionKeys.ToDictionary(x => x, x => 0.0f);
m_blinkExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Blink));
m_blinkExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.BlinkLeft));
m_blinkExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.BlinkRight));
m_lookAtExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookUp));
m_lookAtExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookDown));
m_lookAtExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookLeft));
@@ -196,32 +198,55 @@ namespace UniVRM10
return (ignoreBlink, ignoreLookAt, ignoreMouth);
}
public (bool ignoreBlink, bool ignoreLookAt, bool ignoreMouth) Begin()
public void Apply()
{
//
// get ingore settings
//
var validateState = GetValidateState();
m_ignoreBlink = validateState.ignoreBlink;
m_ignoreLookAt = validateState.ignoreLookAt;
m_ignoreMouth = validateState.ignoreMouth;
if (validateState.ignoreBlink)
{
// cancel blink
m_blinkExpressionKeys.ForEach(x => expressionKeyWeights[x] = 0.0f);
}
m_merger.SetValues(expressionKeyWeights
.Where(x =>
{
// skip ignore
if (validateState.ignoreBlink)
{
switch (x.Key.Preset)
{
case VrmLib.ExpressionPreset.Blink:
case VrmLib.ExpressionPreset.BlinkLeft:
case VrmLib.ExpressionPreset.BlinkRight:
return false;
}
}
if (validateState.ignoreMouth)
{
switch (x.Key.Preset)
{
case VrmLib.ExpressionPreset.Aa:
case VrmLib.ExpressionPreset.Ih:
case VrmLib.ExpressionPreset.Ou:
case VrmLib.ExpressionPreset.Ee:
case VrmLib.ExpressionPreset.Oh:
return false;
}
}
if (validateState.ignoreLookAt)
{
switch (x.Key.Preset)
{
case VrmLib.ExpressionPreset.LookUp:
case VrmLib.ExpressionPreset.LookDown:
case VrmLib.ExpressionPreset.LookLeft:
case VrmLib.ExpressionPreset.LookRight:
return false;
}
}
return validateState;
}
return true;
})
.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value)));
public void End((bool ignoreBlink, bool ignoreLookAt, bool ignoreMouth) validateState)
{
if (validateState.ignoreMouth)
{
m_mouthExpressionKeys.ForEach(x => expressionKeyWeights[x] = 0.0f);
}
m_merger.SetValues(expressionKeyWeights.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value)));
m_merger.Apply();
}
}

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

@@ -209,12 +209,10 @@ namespace UniVRM10
}
}
public void Process(Transform head, SetPresetValue setPresetValue, bool ignoreLookAt)
public void Process(Transform head, SetPresetValue setPresetValue)
{
var (yaw, pitch) = (ignoreLookAt)
? (0.0f, 0.0f)
: GetLookAtYawPitch(head)
;
var (yaw, pitch) = GetLookAtYawPitch(head);
switch (LookAtType)
{
case LookAtTypes.Bone: