Vrm10FastSpringboneRuntimeStandalone

vrm-c · Sep 20, 2024 · c2e203b · c2e203b
1 parent e53ff87
commit c2e203b
Show file tree

Hide file tree

Showing 4 changed files with 434 additions and 12 deletions.
diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10FastSpringboneRuntimeStandalone.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10FastSpringboneRuntimeStandalone.cs
@@ -12,6 +12,8 @@ namespace UniVRM10
     /// <summary>
     /// FastSpringbone(job) で動作します。
     /// FastSpringBoneService(Singleton)を経由せずに直接実行します。
+    /// 
+    /// シーンに２体以上の vrm-1.0 モデルがある場合は FastSpringBoneService でバッチングする方が効率的です。
     /// </summary>
     public class Vrm10FastSpringboneRuntimeStandalone : IVrm10SpringBoneRuntime
     {
@@ -56,6 +58,8 @@ public void Dispose()
         {
             m_bufferCombiner.Unregister(m_fastSpringBoneBuffer);
             m_fastSpringBoneBuffer.Dispose();
+
+            m_fastSpringBoneScheduler.Dispose();
             m_bufferCombiner.Dispose();
         }
 

diff --git a/Assets/VRM10/Runtime/IO/Vrm10.cs b/Assets/VRM10/Runtime/IO/Vrm10.cs
@@ -46,7 +46,8 @@ public static async Task<Vrm10Instance> LoadPathAsync(
             IMaterialDescriptorGenerator materialGenerator = null,
             VrmMetaInformationCallback vrmMetaInformationCallback = null,
             CancellationToken ct = default,
-            ImporterContextSettings importerContextSettings = null)
+            ImporterContextSettings importerContextSettings = null,
+            IVrm10SpringBoneRuntime springboneRuntime = null)
         {
             awaitCaller ??= Application.isPlaying
                 ? new RuntimeOnlyAwaitCaller()
@@ -67,7 +68,8 @@ public static async Task<Vrm10Instance> LoadPathAsync(
                 materialGenerator,
                 vrmMetaInformationCallback,
                 ct,
-                importerContextSettings);
+                importerContextSettings,
+                springboneRuntime);
         }
 
         /// <summary>
@@ -174,7 +176,8 @@ private static async Task<Vrm10Instance> LoadAsync(
             IMaterialDescriptorGenerator materialGenerator,
             VrmMetaInformationCallback vrmMetaInformationCallback,
             CancellationToken ct,
-            ImporterContextSettings importerContextSettings = null)
+            ImporterContextSettings importerContextSettings = null,
+            IVrm10SpringBoneRuntime springboneRuntime = null)
         {
             ct.ThrowIfCancellationRequested();
             if (awaitCaller == null)
@@ -192,7 +195,8 @@ private static async Task<Vrm10Instance> LoadAsync(
                 materialGenerator,
                 vrmMetaInformationCallback,
                 ct,
-                importerContextSettings);
+                importerContextSettings,
+                springboneRuntime);
             if (instance != null)
             {
                 if (ct.IsCancellationRequested)
@@ -218,7 +222,8 @@ private static async Task<Vrm10Instance> LoadAsync(
                 textureDeserializer,
                 materialGenerator,
                 vrmMetaInformationCallback,
-                ct);
+                ct,
+                springboneRuntime);
             if (migratedInstance != null)
             {
                 if (ct.IsCancellationRequested)
@@ -242,7 +247,8 @@ private static async Task<Vrm10Instance> TryLoadingAsVrm10Async(
             IMaterialDescriptorGenerator materialGenerator,
             VrmMetaInformationCallback vrmMetaInformationCallback,
             CancellationToken ct,
-            ImporterContextSettings importerContextSettings = null)
+            ImporterContextSettings importerContextSettings = null,
+            IVrm10SpringBoneRuntime springboneRuntime = null)
         {
             ct.ThrowIfCancellationRequested();
             if (awaitCaller == null)
@@ -269,7 +275,8 @@ private static async Task<Vrm10Instance> TryLoadingAsVrm10Async(
                 materialGenerator,
                 vrmMetaInformationCallback,
                 ct,
-                importerContextSettings);
+                importerContextSettings,
+                springboneRuntime);
         }
 
         private static async Task<Vrm10Instance> TryMigratingFromVrm0XAsync(
@@ -280,7 +287,8 @@ private static async Task<Vrm10Instance> TryMigratingFromVrm0XAsync(
             ITextureDeserializer textureDeserializer,
             IMaterialDescriptorGenerator materialGenerator,
             VrmMetaInformationCallback vrmMetaInformationCallback,
-            CancellationToken ct)
+            CancellationToken ct,
+            IVrm10SpringBoneRuntime springboneRuntime)
         {
             ct.ThrowIfCancellationRequested();
             if (awaitCaller == null)
@@ -308,7 +316,8 @@ private static async Task<Vrm10Instance> TryMigratingFromVrm0XAsync(
                     textureDeserializer,
                     materialGenerator,
                     vrmMetaInformationCallback,
-                    ct);
+                    ct,
+                    springboneRuntime: springboneRuntime);
                 if (migratedVrm10Instance == null)
                 {
                     throw new Exception(migrationData?.Message ?? "Failed to load migrated.");
@@ -327,7 +336,8 @@ private static async Task<Vrm10Instance> LoadVrm10DataAsync(
             IMaterialDescriptorGenerator materialGenerator,
             VrmMetaInformationCallback vrmMetaInformationCallback,
             CancellationToken ct,
-            ImporterContextSettings importerContextSettings = null)
+            ImporterContextSettings importerContextSettings = null,
+            IVrm10SpringBoneRuntime springboneRuntime = null)
         {
             ct.ThrowIfCancellationRequested();
             if (awaitCaller == null)
@@ -345,7 +355,8 @@ private static async Task<Vrm10Instance> LoadVrm10DataAsync(
                        textureDeserializer: textureDeserializer,
                        materialGenerator: materialGenerator,
                        useControlRig: controlRigGenerationOption != ControlRigGenerationOption.None,
-                       settings: importerContextSettings))
+                       settings: importerContextSettings,
+                       springboneRuntime: springboneRuntime))
             {
                 // 1. Load meta information if callback was available.
                 if (vrmMetaInformationCallback != null)