VRMMetaEditor に仮置きしていた UseRuntimeScalingSupport を Vrm0XSpringBoneRunt…

…imeController に移動
vrm-c · Sep 25, 2024 · 512d235 · 512d235
1 parent c6a5599
commit 512d235
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/Assets/VRM/Editor/Meta/VRMMetaEditor.cs b/Assets/VRM/Editor/Meta/VRMMetaEditor.cs
@@ -49,17 +49,6 @@ public override void OnInspectorGUI()
             {
                 m_Inspector.OnInspectorGUI();
             }
-
-            GUILayout.Space(16);
-            var current = m_target.GetComponentsInChildren<VRMSpringBone>().Any(x => x.UseRuntimeScalingSupport);
-            var newValue = GUILayout.Toggle(current, "[experimental] SpringBone scaling params");
-            if (current != newValue)
-            {
-                foreach (var sb in m_target.GetComponentsInChildren<VRMSpringBone>())
-                {
-                    sb.UseRuntimeScalingSupport = newValue;
-                }
-            }
         }
     }
 }
diff --git a/Assets/VRM/Runtime/SpringBone/IVrm0XSpringBoneRuntime.cs b/Assets/VRM/Runtime/SpringBone/IVrm0XSpringBoneRuntime.cs
@@ -4,12 +4,18 @@
 
 namespace VRM
 {
+    public struct SpringRuntimeFrameInfo
+    {
+        public float DeltaTime;
+        public bool UseRuntimeScalingSupport;
+    }
+
     public interface IVrm0XSpringBoneRuntime
     {
         Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller);
 
         void Reset();
 
-        void Process(float deltaTime);
+        void Process(SpringRuntimeFrameInfo frame);
     }
 }
diff --git a/Assets/VRM/Runtime/SpringBone/Jobs/Vrm0XFastSpringBoneRuntime.cs b/Assets/VRM/Runtime/SpringBone/Jobs/Vrm0XFastSpringBoneRuntime.cs
@@ -45,7 +45,7 @@ public void Reset()
             // TODO
         }
 
-        public void Process(float deltaTime)
+        public void Process(SpringRuntimeFrameInfo frame)
         {
             // FastSpringBoneService(Singleton) が自力で Update するので何もしない
         }

diff --git a/Assets/VRM/Runtime/SpringBone/Vrm0XSpringBoneDefaultRuntime.cs b/Assets/VRM/Runtime/SpringBone/Vrm0XSpringBoneDefaultRuntime.cs
@@ -39,14 +39,15 @@ public void Reset()
             }
         }
 
-        public void Process(float deltaTime)
+        public void Process(SpringRuntimeFrameInfo frame)
         {
 #if VRM0X_SPRING_UPDATE_SELF
             // 各 VrmSpringBone が自力で Update するので何もしない
 #else
             foreach (VRMSpringBone sb in m_springs)
             {
-                sb.ManualUpdate(deltaTime);
+                sb.UseRuntimeScalingSupport = frame.UseRuntimeScalingSupport;
+                sb.ManualUpdate(frame.DeltaTime);
             }
 #endif
         }

diff --git a/Assets/VRM/Runtime/SpringBone/Vrm0XSpringBoneRuntimeController.cs b/Assets/VRM/Runtime/SpringBone/Vrm0XSpringBoneRuntimeController.cs
@@ -11,6 +11,8 @@ namespace VRM
     [DefaultExecutionOrder(11000)]
     public class Vrm0XSpringBoneRuntimeController : MonoBehaviour
     {
+        public bool UseRuntimeScalingSupport = false;
+
         IVrm0XSpringBoneRuntime m_springboneRuntime;
         public void SetSpringRuntime(IVrm0XSpringBoneRuntime runtime)
         {
@@ -55,28 +57,25 @@ void LateUpdate()
         {
             if (UpdateType == SpringBoneUpdateType.LateUpdate)
             {
-                Runtime.Process(Time.deltaTime);
+                ManualUpdate(Time.deltaTime);
             }
         }
 
         void FixedUpdate()
         {
             if (UpdateType == SpringBoneUpdateType.FixedUpdate)
             {
-                Runtime.Process(Time.fixedDeltaTime);
+                ManualUpdate(Time.fixedDeltaTime);
             }
         }
 
         public void ManualUpdate(float deltaTime)
         {
-            if (UpdateType == SpringBoneUpdateType.Manual)
-            {
-                Runtime.Process(deltaTime);
-            }
-            else
+            Runtime.Process(new SpringRuntimeFrameInfo
             {
-                throw new System.ArgumentException("require SpringBoneUpdateType.Manual");
-            }
+                DeltaTime = deltaTime,
+                UseRuntimeScalingSupport = UseRuntimeScalingSupport,
+            });
         }
     }
 }