Fix locomotion when player platform moves

(again)
nicoco007 · Oct 2, 2024 · e12331f · e12331f
1 parent 0872296
commit e12331f
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/Source/CustomAvatar/Avatar/AvatarIK.cs b/Source/CustomAvatar/Avatar/AvatarIK.cs
@@ -105,7 +105,7 @@ protected void Start()
             _defaultRootPose = new Pose(vrikManager.references_root.localPosition, vrikManager.references_root.localRotation);
 
             _vrik = _ikHelper.InitializeVRIK(vrikManager, transform);
-            IKSolver solver = _vrik.GetIKSolver();
+            IKSolverVR solver = _vrik.solver;
 
             foreach (TwistRelaxer twistRelaxer in _twistRelaxers)
             {
@@ -128,6 +128,7 @@ protected void Start()
                 }
             }
 
+            solver.OnPreUpdate += OnPreUpdate;
             solver.OnPostUpdate += OnPostUpdate;
 
             if (vrikManager.solver_spine_maintainPelvisPosition > 0 && !_input.allowMaintainPelvisPosition)
@@ -167,28 +168,16 @@ protected void OnDisable()
 
         protected void OnDestroy()
         {
-            IKSolver solver = _vrik.GetIKSolver();
+            IKSolverVR solver = _vrik.solver;
+            solver.OnPreUpdate -= OnPreUpdate;
             solver.OnPostUpdate -= OnPostUpdate;
 
             _input.inputChanged -= OnInputChanged;
         }
 
         #endregion
 
-        private void ApplyPlatformMotion()
-        {
-            Transform parent = transform.parent;
-
-            if (!parent) return;
-
-            Vector3 deltaPosition = parent.position - _previousParentPose.position;
-            Quaternion deltaRotation = parent.rotation * Quaternion.Inverse(_previousParentPose.rotation);
-
-            _vrik.solver.AddPlatformMotion(deltaPosition, deltaRotation, parent.position);
-            _previousParentPose = new Pose(parent.position, parent.rotation);
-        }
-
-        protected void Update()
+        private void OnPreUpdate()
         {
             foreach (BeatSaberDynamicBone::DynamicBone dynamicBone in _dynamicBones)
             {
@@ -206,6 +195,25 @@ private void OnPostUpdate()
             }
         }
 
+        private void ApplyPlatformMotion()
+        {
+            Transform parent = _vrik.references.root.parent;
+
+            if (parent == null)
+            {
+                return;
+            }
+
+            parent.GetPositionAndRotation(out Vector3 parentPosition, out Quaternion parentRotation);
+
+            Vector3 deltaPosition = parentPosition - _previousParentPose.position;
+            Quaternion deltaRotation = Quaternion.Inverse(_previousParentPose.rotation) * parentRotation;
+
+            _vrik.solver.AddPlatformMotion(deltaPosition, deltaRotation, parentPosition);
+
+            _previousParentPose = new Pose(parentPosition, parentRotation);
+        }
+
         private void UpdateLocomotion()
         {
             if (_vrik == null || vrikManager == null)