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

rename variable

Browse Source
This commit is contained in:
ousttrue 2023-08-18 15:06:41 +09:00
parent ce69a840e2
commit eddc4a0e27
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs
View File

@ -21,7 +21,7 @@ namespace UniVRM10
/// </summary>
public class Vrm10Runtime : IDisposable
{
private readonly Vrm10Instance m_target;
private readonly Vrm10Instance m_instance;
private readonly Transform m_head;
private readonly FastSpringBoneService m_fastSpringBoneService;
private readonly IReadOnlyDictionary<Transform, TransformState> m_defaultTransformStates;
@ -51,38 +51,38 @@ namespace UniVRM10
}
}
public Vrm10Runtime(Vrm10Instance target, bool useControlRig)
public Vrm10Runtime(Vrm10Instance instance, bool useControlRig)
{
if (!Application.isPlaying)
{
Debug.LogWarning($"{nameof(Vrm10Runtime)} expects runtime behaviour.");
}
m_target = target;
m_instance = instance;
if (!target.TryGetBoneTransform(HumanBodyBones.Head, out m_head))
if (!instance.TryGetBoneTransform(HumanBodyBones.Head, out m_head))
{
throw new Exception();
}
if (useControlRig)
{
ControlRig = new Vrm10RuntimeControlRig(target.Humanoid, m_target.transform);
ControlRig = new Vrm10RuntimeControlRig(instance.Humanoid, m_instance.transform);
}
Constraints = target.GetComponentsInChildren<IVrm10Constraint>();
LookAt = new Vrm10RuntimeLookAt(target.Vrm.LookAt, target.Humanoid, ControlRig);
Expression = new Vrm10RuntimeExpression(target, LookAt.EyeDirectionApplicable);
Constraints = instance.GetComponentsInChildren<IVrm10Constraint>();
LookAt = new Vrm10RuntimeLookAt(instance.Vrm.LookAt, instance.Humanoid, ControlRig);
Expression = new Vrm10RuntimeExpression(instance, LookAt.EyeDirectionApplicable);
var instance = target.GetComponent<RuntimeGltfInstance>();
if (instance != null)
var gltfInstance = instance.GetComponent<RuntimeGltfInstance>();
if (gltfInstance != null)
{
// ランタイムインポートならここに到達してゼロコストになる
m_defaultTransformStates = instance.InitialTransformStates;
m_defaultTransformStates = gltfInstance.InitialTransformStates;
}
else
{
// エディタでプレハブ配置してる奴ならこっちに到達して収集する
m_defaultTransformStates = target.GetComponentsInChildren<Transform>()
m_defaultTransformStates = instance.GetComponentsInChildren<Transform>()
.ToDictionary(tf => tf, tf => new TransformState(tf));
}
@ -90,7 +90,7 @@ namespace UniVRM10
if (Application.isPlaying)
{
m_fastSpringBoneService = FastSpringBoneService.Instance;
m_fastSpringBoneBuffer = CreateFastSpringBoneBuffer(m_target.SpringBone);
m_fastSpringBoneBuffer = CreateFastSpringBoneBuffer(m_instance.SpringBone);
m_fastSpringBoneService.BufferCombiner.Register(m_fastSpringBoneBuffer);
}
}
@ -111,7 +111,7 @@ namespace UniVRM10
m_fastSpringBoneService.BufferCombiner.Unregister(m_fastSpringBoneBuffer);
m_fastSpringBoneBuffer.Dispose();
m_fastSpringBoneBuffer = CreateFastSpringBoneBuffer(m_target.SpringBone);
m_fastSpringBoneBuffer = CreateFastSpringBoneBuffer(m_instance.SpringBone);
m_fastSpringBoneService.BufferCombiner.Register(m_fastSpringBoneBuffer);
}
@ -229,7 +229,7 @@ namespace UniVRM10
}
// 4. Gaze control
LookAt.Process(m_target.LookAtTargetType, m_target.LookAtTarget);
LookAt.Process(m_instance.LookAtTargetType, m_instance.LookAtTarget);
// 5. Apply Expression
Expression.Process(LookAt.EyeDirection);