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

make Expression merger classes internal.

Browse Source
This commit is contained in:
Masataka SUMI 2021-01-29 19:12:01 +09:00
parent d45390199f
commit 144ee3fd67
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ namespace UniVRM10
/// <summary>
/// ブレンドシェイプを蓄えてまとめて適用するクラス
/// </summary>
class ExpressionMerger
internal class ExpressionMerger
{
/// <summary>
/// Key から Expression を得る
@ -35,15 +35,6 @@ namespace UniVRM10
m_materialValueBindingMerger = new MaterialValueBindingMerger(m_clipMap, root);
}
/// <summary>
/// 蓄積した値を適用する
/// </summary>
public void Apply()
{
m_morphTargetBindingMerger.Apply();
m_materialValueBindingMerger.Apply();
}
/// <summary>
/// まとめて反映する。1フレームに1回呼び出されることを想定
/// </summary>
@ -54,14 +45,12 @@ namespace UniVRM10
{
AccumulateValue(kv.Key, kv.Value);
}
m_morphTargetBindingMerger.Apply();
m_materialValueBindingMerger.Apply();
}
/// <summary>
/// 即時に反映しない。後にApplyによって反映する
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void AccumulateValue(ExpressionKey key, float value)
private void AccumulateValue(ExpressionKey key, float value)
{
m_valueMap[key] = value;

2
Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
View File

@ -7,7 +7,7 @@ namespace UniVRM10
///
/// Base + (A.Target - Base) * A.Weight + (B.Target - Base) * B.Weight ...
///
class MaterialValueBindingMerger
internal class MaterialValueBindingMerger
{
#region MaterialMap
/// <summary>

2
Assets/VRM10/Runtime/Components/Expression/MorphTargetBindingMerger.cs
View File

@ -7,7 +7,7 @@ namespace UniVRM10
///
/// A.Value * A.Weight + B.Value * B.Weight ...
///
class MorphTargetBindingMerger
internal class MorphTargetBindingMerger
{
class DictionaryKeyMorphTargetBindingComparer : IEqualityComparer<MorphTargetBinding>
{

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

@ -49,7 +49,6 @@ namespace UniVRM10
public void Apply()
{
m_merger.SetValues(m_accumulator.FrameExpression());
m_merger.Apply();
}
}
}