From 63eb58d6b74806a68472cb98fa4a939715fafb2f Mon Sep 17 00:00:00 2001
From: amamagi <amausagiii@gmail.com>
Date: Mon, 27 Jun 2022 10:43:21 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"Vrm10Runtime.ReconstructSpringBone?=
 =?UTF-8?q?=E3=82=92=E5=91=BC=E3=82=93=E3=81=A0=E6=99=82=E7=82=B9=E3=81=AE?=
 =?UTF-8?q?SpringBone=E3=81=AE=E5=BD=A2=E7=8A=B6=E3=82=92=E7=B6=AD?=
 =?UTF-8?q?=E6=8C=81=E3=81=99=E3=82=8B=E6=96=B9=E5=90=91=E3=81=AB=E5=89=9B?=
 =?UTF-8?q?=E6=80=A7=E3=81=8C=E5=83=8D=E3=81=84=E3=81=A6=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=86=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 904b82c1148c6e8e739f691f333bf53dad9c1b77.
---
 .../Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs    | 10 +---------
 .../FastSpringBone/InputPorts/FastSpringBoneBuffer.cs  |  2 +-
 .../FastSpringBone/InputPorts/FastSpringBoneJoint.cs   |  1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs
index f293005e0..efaefef26 100644
--- a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs
+++ b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10Runtime.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UniVRM10.FastSpringBones.Blittables;
@@ -16,8 +15,6 @@ namespace UniVRM10
         private readonly IVrm10Constraint[] m_constraints;
         private readonly Transform m_head;
         private readonly FastSpringBoneService m_fastSpringBoneService;
-        private readonly Dictionary<Transform, Quaternion> m_initialLocalRotations = new Dictionary<Transform, Quaternion>();
-        private readonly bool m_initialized;
 
         private FastSpringBoneBuffer m_fastSpringBoneBuffer;
 
@@ -54,7 +51,6 @@ namespace UniVRM10
             m_fastSpringBoneService = FastSpringBoneService.Instance;
             m_fastSpringBoneBuffer = CreateFastSpringBoneBuffer(m_target.SpringBone);
             m_fastSpringBoneService.BufferCombiner.Register(m_fastSpringBoneBuffer);
-            m_initialized = true;
         }
 
         /// <summary>
@@ -101,11 +97,7 @@ namespace UniVRM10
                             gravityDir = joint.m_gravityDir,
                             gravityPower = joint.m_gravityPower,
                             stiffnessForce = joint.m_stiffnessForce
-                        },
-                        InitialLocalRotation = 
-                            m_initialized && m_initialLocalRotations.TryGetValue(joint.transform, out var initialLocalRotation)
-                                ? initialLocalRotation
-                                : m_initialLocalRotations[joint.transform] = joint.transform.localRotation
+                        }
                     }).ToArray(),
                 }).ToArray());
         }
diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs b/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs
index 1d6d7da7a..84186af62 100644
--- a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs
+++ b/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs
@@ -108,7 +108,7 @@ namespace UniVRM10.FastSpringBones.System
                         parentTransformIndex = parent != null ? transformIndexDictionary[parent] : -1,
                         currentTail = currentTail,
                         prevTail = currentTail,
-                        localRotation = joint.InitialLocalRotation,
+                        localRotation = joint.Transform.localRotation,
                         boneAxis = localChildPosition.normalized,
                         length = localChildPosition.magnitude
                     });
diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs b/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs
index 25e70f94b..7aff7cf71 100644
--- a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs
+++ b/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs
@@ -9,6 +9,5 @@ namespace UniVRM10.FastSpringBones.System
     {
         public Transform Transform;
         public BlittableJoint Joint;
-        public Quaternion InitialLocalRotation;
     }
 }
\ No newline at end of file