From eddc4a0e276ff04d1b952b1a3cfc3d3571ea9935 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 18 Aug 2023 15:06:41 +0900 Subject: [PATCH] rename variable --- .../Components/Vrm10Runtime/Vrm10Runtime.cs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs index 459ca4266..8bc37b485 100644 --- a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs +++ b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs @@ -21,7 +21,7 @@ namespace UniVRM10 /// 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 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(); - LookAt = new Vrm10RuntimeLookAt(target.Vrm.LookAt, target.Humanoid, ControlRig); - Expression = new Vrm10RuntimeExpression(target, LookAt.EyeDirectionApplicable); + Constraints = instance.GetComponentsInChildren(); + LookAt = new Vrm10RuntimeLookAt(instance.Vrm.LookAt, instance.Humanoid, ControlRig); + Expression = new Vrm10RuntimeExpression(instance, LookAt.EyeDirectionApplicable); - var instance = target.GetComponent(); - if (instance != null) + var gltfInstance = instance.GetComponent(); + if (gltfInstance != null) { // ランタイムインポートならここに到達してゼロコストになる - m_defaultTransformStates = instance.InitialTransformStates; + m_defaultTransformStates = gltfInstance.InitialTransformStates; } else { // エディタでプレハブ配置してる奴ならこっちに到達して収集する - m_defaultTransformStates = target.GetComponentsInChildren() + m_defaultTransformStates = instance.GetComponentsInChildren() .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);