Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-27 21:34:38 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/same_material_copy

Browse Source
This commit is contained in:
ousttrue
2026-07-23 14:54:01 +09:00
committed by GitHub
parent ccfa754779 ba09e7761a
commit 824ca14e28
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/VRM10/Runtime/Components/Expression/ExpressionMerger.cs
View File

@@ -32,6 +32,16 @@ namespace UniVRM10
bool isPrefabInstance,
IReadOnlyDictionary<Transform, TransformState> initPose)
{
InitializeOrReload(expressions, root, isPrefabInstance, initPose);
}
internal void InitializeOrReload(VRM10ObjectExpression expressions,
Transform root,
bool isPrefabInstance,
IReadOnlyDictionary<Transform, TransformState> initPose)
{
Dispose();
m_clipMap = expressions.Clips.ToDictionary(
x => expressions.CreateKey(x.Clip),
x => x.Clip,
@@ -79,9 +89,12 @@ namespace UniVRM10
m_boneTransformBindingMerger.AccumulateValue(key, value);
}
/// <summary>
/// 未初期化呼び出し及び再呼び出しで正常に動くように注意 !
/// </summary>
public void Dispose()
{
m_materialValueBindingMerger.Dispose();
m_materialValueBindingMerger?.Dispose();
}
}
}

33
Packages/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeExpression.cs
View File

@@ -10,6 +10,7 @@ namespace UniVRM10
{
public static IExpressionValidatorFactory ExpressionValidatorFactory = new DefaultExpressionValidator.Factory();
private bool _isPrefabInstance;
private List<ExpressionKey> _keys = new List<ExpressionKey>();
private Dictionary<ExpressionKey, float> _inputWeights = new Dictionary<ExpressionKey, float>();
private Dictionary<ExpressionKey, float> _actualWeights = new Dictionary<ExpressionKey, float>();
@@ -25,12 +26,13 @@ namespace UniVRM10
public float LookAtOverrideRate { get; private set; }
public float MouthOverrideRate { get; private set; }
internal Vrm10RuntimeExpression(Vrm10Instance target,
ILookAtEyeDirectionApplicable eyeDirectionApplicable,
internal Vrm10RuntimeExpression(Vrm10Instance target,
ILookAtEyeDirectionApplicable eyeDirectionApplicable,
bool isPrefabInstance,
IReadOnlyDictionary<Transform, TransformState> initPose
)
{
_isPrefabInstance = isPrefabInstance;
_merger = new ExpressionMerger(target.Vrm.Expression, target.transform, isPrefabInstance, initPose);
_keys = target.Vrm.Expression.Clips
.Select(x => target.Vrm.Expression.CreateKey(x.Clip))
@@ -55,6 +57,33 @@ namespace UniVRM10
_eyeDirectionApplicable = eyeDirectionApplicable;
}
/// <summary>
/// target.Vrm.Expression に基づいて再初期化する。
///
/// https://github.com/vrm-c/UniVRM/issues/2802
///
/// ex.
/// vrmInstance.Vrm.Expression.AddClip(ExpressionPreset.custom, myCustomExpression);
/// vrmInstance.Runtime.Expression.Reload(vrmInstance);
///
/// </summary>
public void Reload(Vrm10Instance target)
{
// 最新の表情定義に基づいて再生成
_merger.InitializeOrReload(target.Vrm.Expression, target.transform, _isPrefabInstance, target.Runtime.InitPose);
_keys = target.Vrm.Expression.Clips.Select(x => target.Vrm.Expression.CreateKey(x.Clip)).ToList();
// リロード時の一瞬の表情カクつきを防ぐため、既に設定されていたウェイトを引き継ぐ
var oldInputWeights = _inputWeights;
_inputWeights = _keys.ToDictionary(x => x, x => 0f);
foreach (var key in _keys)
{
if (oldInputWeights.ContainsKey(key)) _inputWeights[key] = oldInputWeights[key];
}
_actualWeights = _keys.ToDictionary(x => x, x => 0f);
_validator = ExpressionValidatorFactory.Create(target.Vrm.Expression);
}
public void Dispose()
{
_merger?.Dispose();