Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-10-02 07:42:25 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #449 from ousttrue/fix_VRMLookAtBlendShapeApplyer

Browse Source 
Fix vrm look at blend shape applyer
This commit is contained in:
hiroj
2020-07-01 12:41:53 +09:00
committed by GitHub
parent 4b2600f98c ebe0c67a2b
commit 0fede9a708
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/VRM.Samples/Scripts/ViewerUI.cs
View File

@@ -167,6 +167,7 @@ namespace VRM.Samples
}
HumanPoseTransfer m_loaded;
VRMBlendShapeProxy m_proxy;
AIUEO m_lipSync;
bool m_enableLipSyncValue;
@@ -235,6 +236,11 @@ namespace VRM.Samples
}
m_ui.UpdateToggle(EnableBvh, EnableTPose);
if (m_proxy != null)
{
m_proxy.Apply();
}
}
void EnableBvh()
@@ -361,6 +367,8 @@ namespace VRM.Samples
{
animation.Play(animation.clip.name);
}
m_proxy = go.GetComponent<VRMBlendShapeProxy>();
}
}

15
Assets/VRM/UniVRM/Scripts/LookAt/VRMLookAtBlendShapeApplyer.cs
View File

@@ -17,8 +17,21 @@ namespace VRM
[SerializeField]
public CurveMapper VerticalUp = new CurveMapper(90.0f, 1.0f);
/// <summary>
/// v0.56 からデフォルト値を true に変更
///
/// true の場合: BlendShapeProxy.AccumulateValue を使う(推奨)
/// 別途 BlendShapeProxy.Apply を別の場所で呼び出す必要があります
/// false の場合: BlendShapeProxy.ImmediatelySetValueを使う
/// 目をテクスチャUVのOffset値の変更で表現するモデルの場合に、
/// Material.SetVector("_MainTex_ST", new Vector4(1, 1, 横の移動値, 0))
/// Material.SetVector("_MainTex_ST", new Vector4(1, 1, 0, 縦の移動値))
/// と連続で呼ばれることで、横の移動値が打ち消されてしまいます。
/// BlendShapeProxy.AccumulateValue はこの値を加算して new Vector4(1, 1, 横の移動値, 縦の移動値)
/// となるように扱えます。
/// </summary>
[SerializeField]
public bool m_notSetValueApply;
public bool m_notSetValueApply = true;
public void OnImported(VRMImporterContext context)
{