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

IExpressionAccumulator

Browse Source
This commit is contained in:
ousttrue 2021-01-26 17:03:12 +09:00
parent 9c56c7561c
commit b2fd1dc8ce
6 changed files with 286 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/VRM10/Editor/Components/VRM10ControllerEditor.cs
View File

@ -178,9 +178,9 @@ namespace UniVRM10
EditorGUILayout.Space();
EditorGUILayout.LabelField("IgnoreStatus", EditorStyles.boldLabel);
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.Toggle("Ignore Blink", m_target.Expression.IgnoreBlink);
EditorGUILayout.Toggle("Ignore Look At", m_target.Expression.IgnoreLookAt);
EditorGUILayout.Toggle("Ignore Mouth", m_target.Expression.IgnoreMouth);
EditorGUILayout.Toggle("Ignore Blink", m_target.Expression.Accumulator.IgnoreBlink);
EditorGUILayout.Toggle("Ignore Look At", m_target.Expression.Accumulator.IgnoreLookAt);
EditorGUILayout.Toggle("Ignore Mouth", m_target.Expression.Accumulator.IgnoreMouth);
EditorGUI.EndDisabledGroup();
if (!Application.isPlaying)
@ -200,7 +200,7 @@ namespace UniVRM10
{
m_expressionKeyWeights[slider.Key] = slider.Value;
}
m_target.Expression.SetValues(m_expressionKeyWeights.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value)));
m_target.Expression.Accumulator.SetValues(m_expressionKeyWeights.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value)));
}
}

14
Assets/VRM10/Runtime/Components/Expression/ExpressionMerger.cs
View File

@ -16,8 +16,6 @@ namespace UniVRM10
/// </summary>
Dictionary<ExpressionKey, VRM10Expression> m_clipMap;
public IEnumerable<ExpressionKey> ExpressionKeys => m_clipMap.Keys;
/// <summary>
/// Expression のWeightを記録する
/// </summary>
@ -82,18 +80,6 @@ namespace UniVRM10
m_materialValueBindingMerger.AccumulateValue(clip, value);
}
public VRM10Expression GetClip(ExpressionKey key)
{
if (m_clipMap.ContainsKey(key))
{
return m_clipMap[key];
}
else
{
return null;
}
}
public void RestoreMaterialInitialValues()
{
m_materialValueBindingMerger.RestoreMaterialInitialValues();

253
Assets/VRM10/Runtime/Components/ExpressionAccumulator.cs Normal file
View File

@ -0,0 +1,253 @@
using System.Collections.Generic;
using System.Linq;
namespace UniVRM10
{
/// <summary>
/// １フレーム分の Expression を蓄える
/// </summary>
public interface IExpressionAccumulator
{
/// <summary>
/// 開始時に初期化する
/// </summary>
/// <param name="avatar"></param>
void OnStart(VRM10ExpressionAvatar avatar);
/// <summary>
/// 蓄えて処理(ignoreフラグなど)した結果を得る
/// </summary>
/// <returns></returns>
IEnumerable<KeyValuePair<ExpressionKey, float>> FrameExpression();
void SetValue(ExpressionKey key, float value);
void SetValues(IEnumerable<KeyValuePair<ExpressionKey, float>> values);
float GetValue(ExpressionKey key);
IEnumerable<KeyValuePair<ExpressionKey, float>> GetValues();
bool IgnoreBlink { get; }
bool IgnoreLookAt { get; }
bool IgnoreMouth { get; }
}
public static class ExpressionAccumulatorExtensions
{
public static float GetPresetValue(this IExpressionAccumulator self, VrmLib.ExpressionPreset key)
{
var expressionKey = new ExpressionKey(key);
return self.GetValue(expressionKey);
}
public static float GetCustomValue(this IExpressionAccumulator self, string key)
{
var expressionKey = ExpressionKey.CreateCustom(key);
return self.GetValue(expressionKey);
}
public static void SetPresetValue(this IExpressionAccumulator self, VrmLib.ExpressionPreset key, float value)
{
var expressionKey = new ExpressionKey(key);
self.SetValue(expressionKey, value);
}
public static void SetCustomValue(this IExpressionAccumulator self, string key, float value)
{
var expressionKey = ExpressionKey.CreateCustom(key);
self.SetValue(expressionKey, value);
}
}
public class DefaultExpressionAccumulator : IExpressionAccumulator
{
bool m_ignoreBlink;
bool m_ignoreLookAt;
bool m_ignoreMouth;
public bool IgnoreBlink => m_ignoreBlink;
public bool IgnoreLookAt => m_ignoreLookAt;
public bool IgnoreMouth => m_ignoreMouth;
public Dictionary<ExpressionKey, float> expressionKeyWeights = new Dictionary<ExpressionKey, float>();
List<ExpressionKey> m_blinkExpressionKeys = new List<ExpressionKey>();
List<ExpressionKey> m_lookAtExpressionKeys = new List<ExpressionKey>();
List<ExpressionKey> m_mouthExpressionKeys = new List<ExpressionKey>();
/// <summary>
/// Key から Expression を得る
/// </summary>
Dictionary<ExpressionKey, VRM10Expression> m_clipMap;
public void OnStart(VRM10ExpressionAvatar avatar)
{
m_clipMap = avatar.Clips.ToDictionary(x => ExpressionKey.CreateFromClip(x), x => x);
expressionKeyWeights = m_clipMap.Keys.ToDictionary(x => x, x => 0.0f);
m_blinkExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Blink));
m_blinkExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.BlinkLeft));
m_blinkExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.BlinkRight));
m_lookAtExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookUp));
m_lookAtExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookDown));
m_lookAtExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookLeft));
m_lookAtExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookRight));
m_mouthExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Aa));
m_mouthExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Ih));
m_mouthExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Ou));
m_mouthExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Ee));
m_mouthExpressionKeys.Add(m_clipMap.Keys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Oh));
}
public VRM10Expression GetClip(ExpressionKey key)
{
if (m_clipMap.ContainsKey(key))
{
return m_clipMap[key];
}
else
{
return null;
}
}
public IEnumerable<KeyValuePair<ExpressionKey, float>> FrameExpression()
{
var validateState = GetValidateState();
m_ignoreBlink = validateState.ignoreBlink;
m_ignoreLookAt = validateState.ignoreLookAt;
m_ignoreMouth = validateState.ignoreMouth;
return 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 true;
})
.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value));
}
/// <summary>
/// SetValue
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void SetValue(ExpressionKey key, float value)
{
if (expressionKeyWeights.ContainsKey(key))
{
expressionKeyWeights[key] = value;
}
}
/// <summary>
/// Get a expression value
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public float GetValue(ExpressionKey key)
{
if (expressionKeyWeights.ContainsKey(key))
{
return expressionKeyWeights[key];
}
else
{
return 0.0f;
}
}
public IEnumerable<KeyValuePair<ExpressionKey, float>> GetValues()
{
return expressionKeyWeights.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value));
}
/// <summary>
/// Set expression values.
/// </summary>
/// <param name="values"></param>
public void SetValues(IEnumerable<KeyValuePair<ExpressionKey, float>> values)
{
foreach (var keyValue in values)
{
if (expressionKeyWeights.ContainsKey(keyValue.Key))
{
expressionKeyWeights[keyValue.Key] = keyValue.Value;
}
}
}
public IEnumerable<ExpressionKey> GetKeys()
{
return expressionKeyWeights.Keys;
}
private (bool ignoreBlink, bool ignoreLookAt, bool ignoreMouth) GetValidateState()
{
var ignoreBlink = false;
var ignoreLookAt = false;
var ignoreMouth = false;
foreach (var keyWeight in expressionKeyWeights)
{
if (keyWeight.Value <= 0.0f)
continue;
// Blink
if (!ignoreBlink && GetClip(keyWeight.Key).IgnoreBlink && !m_blinkExpressionKeys.Contains(keyWeight.Key))
{
ignoreBlink = true;
}
// LookAt
if (!ignoreLookAt && GetClip(keyWeight.Key).IgnoreLookAt && !m_lookAtExpressionKeys.Contains(keyWeight.Key))
{
ignoreLookAt = true;
}
// Mouth
if (!ignoreMouth && GetClip(keyWeight.Key).IgnoreMouth && !m_mouthExpressionKeys.Contains(keyWeight.Key))
{
ignoreMouth = true;
}
}
return (ignoreBlink, ignoreLookAt, ignoreMouth);
}
}
}

11
Assets/VRM10/Runtime/Components/ExpressionAccumulator.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3960aa2fa84da6a46a559ffbc6286cb0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@ -140,7 +140,7 @@ namespace UniVRM10
//
// gaze control
//
LookAt.Process(Head, Expression.SetPresetValue);
LookAt.Process(Head, Expression.Accumulator.SetPresetValue);
//
// expression

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

@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
namespace UniVRM10
@ -11,22 +9,6 @@ namespace UniVRM10
[SerializeField]
public VRM10ExpressionAvatar ExpressionAvatar;
bool m_ignoreBlink;
bool m_ignoreLookAt;
bool m_ignoreMouth;
#region for CustomEditor
public bool IgnoreBlink => m_ignoreBlink;
public bool IgnoreLookAt => m_ignoreLookAt;
public bool IgnoreMouth => m_ignoreMouth;
#endregion
public Dictionary<ExpressionKey, float> expressionKeyWeights = new Dictionary<ExpressionKey, float>();
List<ExpressionKey> m_blinkExpressionKeys = new List<ExpressionKey>();
List<ExpressionKey> m_lookAtExpressionKeys = new List<ExpressionKey>();
List<ExpressionKey> m_mouthExpressionKeys = new List<ExpressionKey>();
ExpressionMerger m_merger;
public void Dispose()
@ -37,6 +19,20 @@ namespace UniVRM10
}
}
IExpressionAccumulator m_accumulator;
public IExpressionAccumulator Accumulator
{
get
{
if (m_accumulator == null)
{
m_accumulator = new DefaultExpressionAccumulator();
}
return m_accumulator;
}
}
public void OnStart(Transform transform)
{
if (ExpressionAvatar != null)
@ -45,208 +41,14 @@ namespace UniVRM10
{
m_merger = new ExpressionMerger(ExpressionAvatar.Clips, transform);
}
Accumulator.OnStart(ExpressionAvatar);
}
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));
m_lookAtExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.LookRight));
m_mouthExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Aa));
m_mouthExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Ih));
m_mouthExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Ou));
m_mouthExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Ee));
m_mouthExpressionKeys.Add(m_merger.ExpressionKeys.FirstOrDefault(x => x.Preset == VrmLib.ExpressionPreset.Oh));
}
/// <summary>
/// SetValue
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void SetValue(ExpressionKey key, float value)
{
if (expressionKeyWeights.ContainsKey(key))
{
expressionKeyWeights[key] = value;
}
}
/// <summary>
/// Get a expression value
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public float GetValue(ExpressionKey key)
{
if (expressionKeyWeights.ContainsKey(key))
{
return expressionKeyWeights[key];
}
else
{
return 0.0f;
}
}
public IEnumerable<KeyValuePair<ExpressionKey, float>> GetValues()
{
return expressionKeyWeights.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value));
}
/// <summary>
/// Set expression values.
/// </summary>
/// <param name="values"></param>
public void SetValues(IEnumerable<KeyValuePair<ExpressionKey, float>> values)
{
foreach (var keyValue in values)
{
if (expressionKeyWeights.ContainsKey(keyValue.Key))
{
expressionKeyWeights[keyValue.Key] = keyValue.Value;
}
}
}
#region Setter and Getter
public float GetPresetValue(VrmLib.ExpressionPreset key)
{
var expressionKey = new ExpressionKey(key);
if (this.expressionKeyWeights.ContainsKey(expressionKey))
{
return this.expressionKeyWeights[expressionKey];
}
else
{
return 0.0f;
}
}
public float GetCustomValue(String key)
{
var expressionKey = ExpressionKey.CreateCustom(key);
if (this.expressionKeyWeights.ContainsKey(expressionKey))
{
return this.expressionKeyWeights[expressionKey];
}
else
{
return 0.0f;
}
}
public void SetPresetValue(VrmLib.ExpressionPreset key, float value)
{
var expressionKey = new ExpressionKey(key);
if (this.expressionKeyWeights.ContainsKey(expressionKey))
{
this.expressionKeyWeights[expressionKey] = value;
}
}
/// <parameter>key</parameter>
public void SetCustomValue(String key, float value)
{
var expressionKey = ExpressionKey.CreateCustom(key);
if (this.expressionKeyWeights.ContainsKey(expressionKey))
{
this.expressionKeyWeights[expressionKey] = value;
}
}
#endregion
public IEnumerable<ExpressionKey> GetKeys()
{
return expressionKeyWeights.Keys;
}
private (bool ignoreBlink, bool ignoreLookAt, bool ignoreMouth) GetValidateState()
{
var ignoreBlink = false;
var ignoreLookAt = false;
var ignoreMouth = false;
foreach (var keyWeight in expressionKeyWeights)
{
if (keyWeight.Value <= 0.0f)
continue;
// Blink
if (!ignoreBlink && m_merger.GetClip(keyWeight.Key).IgnoreBlink && !m_blinkExpressionKeys.Contains(keyWeight.Key))
{
ignoreBlink = true;
}
// LookAt
if (!ignoreLookAt && m_merger.GetClip(keyWeight.Key).IgnoreLookAt && !m_lookAtExpressionKeys.Contains(keyWeight.Key))
{
ignoreLookAt = true;
}
// Mouth
if (!ignoreMouth && m_merger.GetClip(keyWeight.Key).IgnoreMouth && !m_mouthExpressionKeys.Contains(keyWeight.Key))
{
ignoreMouth = true;
}
}
return (ignoreBlink, ignoreLookAt, ignoreMouth);
}
public void Apply()
{
var validateState = GetValidateState();
m_ignoreBlink = validateState.ignoreBlink;
m_ignoreLookAt = validateState.ignoreLookAt;
m_ignoreMouth = validateState.ignoreMouth;
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 true;
})
.Select(x => new KeyValuePair<ExpressionKey, float>(x.Key, x.Value)));
m_merger.SetValues(m_accumulator.FrameExpression());
m_merger.Apply();
}
}