UniGTLF/Runtime/SpringBoneJobs from VRM10/Runtime/FastSpringBone

Assets/UniGLTF/Runtime/SpringBoneJobs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e65343205e21bc24b98dbdb05ee56f01
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableCollider.cs

@@ -1,8 +1,7 @@
 using System;
 using UnityEngine;
-using UnityEngine.Serialization;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     /// <summary>
     /// Blittableなコライダ

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableColliderType.cs

@@ -1,4 +1,4 @@
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     public enum BlittableColliderType
     {

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableExternalData.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     /// <summary>
     /// 外力等の毎フレーム更新されうる外部から与えられる情報

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableJoint.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     /// <summary>
     /// SpringBoneの各関節を表すデータ型

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableLogic.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     /// <summary>
     /// SpringBoneの各関節に紐付いた計算情報を表すデータ型

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpan.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     [Serializable]
     public struct BlittableSpan

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpring.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     /// <summary>
     /// 1本の毛束を表すデータ型

Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableTransform.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace UniVRM10.FastSpringBones.Blittables
+namespace UniGLTF.SpringBoneJobs.Blittables
 {
     /// <summary>
     /// Transformの必要な機能だけを絞り、Blittableに対応させたクラス

Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneBufferCombiner.cs

@@ -6,12 +6,13 @@ using Unity.Jobs;
 using UnityEngine;
 using UnityEngine.Jobs;
 using UnityEngine.Profiling;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
+using UniGLTF.SpringBoneJobs.InputPorts;
 #if ENABLE_SPRINGBONE_BURST
 using Unity.Burst;
 #endif
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs
 {
     /// <summary>
     /// FastSpringBoneの処理に利用するバッファを全て結合して持つクラス

Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneBuffer.cs

@@ -5,9 +5,9 @@ using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
 using UnityEngine.Profiling;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs.InputPorts
 {
     /// <summary>
     /// ひとつのVRMに紐づくFastSpringBoneに関連したバッファを保持するクラス

Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneCollider.cs

@@ -1,8 +1,8 @@
 using System;
 using UnityEngine;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs.InputPorts
 {
     [Serializable]
     public struct FastSpringBoneCollider

Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneJoint.cs

@@ -1,8 +1,8 @@
 using System;
 using UnityEngine;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs.InputPorts
 {
     [Serializable]
     public struct FastSpringBoneJoint

Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneSpring.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs.InputPorts
 {
     [Serializable]
     public struct FastSpringBoneSpring

Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs

@@ -0,0 +1,33 @@
+using Unity.Collections;
+using UnityEngine.Jobs;
+using UniGLTF.SpringBoneJobs.Blittables;
+#if ENABLE_SPRINGBONE_BURST
+using Unity.Burst;
+#endif
+
+namespace UniGLTF.SpringBoneJobs
+{
+
+#if ENABLE_SPRINGBONE_BURST
+    [BurstCompile]
+#endif
+    public struct PullTransformJob : IJobParallelForTransform
+    {
+        [WriteOnly] public NativeArray<BlittableTransform> Transforms;
+
+        public void Execute(int index, TransformAccess transform)
+        {
+            Transforms[index] = new BlittableTransform
+            {
+                position = transform.position,
+                rotation = transform.rotation,
+                localPosition = transform.localPosition,
+                localRotation = transform.localRotation,
+                localScale = transform.localScale,
+                localToWorldMatrix = transform.localToWorldMatrix,
+                worldToLocalMatrix = transform.worldToLocalMatrix
+            };
+        }
+    }
+}
+    

Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b9fd53b4431b41909c1b1d882a2d446b
+timeCreated: 1633072084

Assets/UniGLTF/Runtime/SpringBoneJobs/PushTransformJob.cs

@@ -1,11 +1,11 @@
 using Unity.Collections;
 using UnityEngine.Jobs;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
 #if ENABLE_SPRINGBONE_BURST
 using Unity.Burst;
 #endif
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs
 {
 #if ENABLE_SPRINGBONE_BURST
     [BurstCompile]

Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef

@@ -0,0 +1,14 @@
+{
+    "name": "SpringBoneJobs",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3e5d614bc16b50d41bd94c8d7444ca46
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UniGLTF/Runtime/SpringBoneJobs/UpdateFastSpringBoneJob.cs

@@ -2,12 +2,12 @@ using System;
 using Unity.Collections;
 using Unity.Jobs;
 using UnityEngine;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
 #if ENABLE_SPRINGBONE_BURST
 using Unity.Burst;
 #endif
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniGLTF.SpringBoneJobs
 {
 #if ENABLE_SPRINGBONE_BURST
     [BurstCompile]

Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeSpringBone.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using UniGLTF;
 using UniGLTF.Utils;
 using UnityEngine;
-using UniVRM10.FastSpringBones.Blittables;
-using UniVRM10.FastSpringBones.System;
+using UniGLTF.SpringBoneJobs.Blittables;
+using UniGLTF.SpringBoneJobs.InputPorts;
 
 namespace UniVRM10
 {
@@ -13,7 +13,7 @@ namespace UniVRM10
     {
         private readonly Vrm10Instance m_instance;
         private readonly IReadOnlyDictionary<Transform, TransformState> m_defaultTransformStates;
-        private readonly FastSpringBoneService m_fastSpringBoneService;
+        private readonly FastSpringBones.FastSpringBoneService m_fastSpringBoneService;
         private FastSpringBoneSpring[] m_springs;
         private Quaternion[] m_initialLocalRotations;
         private FastSpringBoneBuffer m_fastSpringBoneBuffer;
@@ -47,7 +47,7 @@ namespace UniVRM10
             // NOTE: FastSpringBoneService は UnitTest などでは動作しない
             if (Application.isPlaying)
             {
-                m_fastSpringBoneService = FastSpringBoneService.Instance;
+                m_fastSpringBoneService = FastSpringBones.FastSpringBoneService.Instance;
                 ReconstructSpringBone();
             }
         }

Assets/VRM10/Runtime/FastSpringBone/FastSpringBone10.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "FastSpringBone10",
+    "rootNamespace": "",
     "references": [
-        "GUID:2665a8d13d1b3f18800f46e256720795"
+        "GUID:2665a8d13d1b3f18800f46e256720795",
+        "GUID:3e5d614bc16b50d41bd94c8d7444ca46"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneScheduler.cs

@@ -1,9 +1,10 @@
 using System;
+using UniGLTF.SpringBoneJobs;
 using Unity.Jobs;
 using UnityEngine;
 using UnityEngine.Jobs;
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniVRM10.FastSpringBones
 {
     public sealed class FastSpringBoneScheduler : IDisposable
     {

Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneService.cs

@@ -1,6 +1,7 @@
+using UniGLTF.SpringBoneJobs;
 using UnityEngine;
 
-namespace UniVRM10.FastSpringBones.System
+namespace UniVRM10.FastSpringBones
 {
     [DefaultExecutionOrder(11010)]
     /// <summary>

Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs

@@ -1,6 +1,6 @@
 using Unity.Collections;
 using UnityEngine.Jobs;
-using UniVRM10.FastSpringBones.Blittables;
+using UniGLTF.SpringBoneJobs.Blittables;
 #if ENABLE_SPRINGBONE_BURST
 using Unity.Burst;
 #endif

Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: b9fd53b4431b41909c1b1d882a2d446b
-timeCreated: 1633072084
+fileFormatVersion: 2
+guid: 6cbbe7ad561feca4fb8f91f999755d9e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/VRM10/Runtime/VRM10.asmdef

@@ -4,13 +4,12 @@
     "references": [
         "GUID:2ef84b520212e174a94668c7a0862d3b",
         "GUID:8d76e605759c3f64a957d63ef96ada7c",
-        "GUID:da3e51d19d51a544fa14d43fee843098",
-        "GUID:bce005214fa49654d93927908c15b1f2",
         "GUID:0aaf403bd13871a44b7127aef2695ff8",
         "GUID:b7aa47b240b57de44a4b2021c143c9bf",
         "GUID:f2ca1407928ebdc4bbe7765cc278be44",
         "GUID:2665a8d13d1b3f18800f46e256720795",
-        "GUID:1cd941934d098654fa21a13f28346412"
+        "GUID:1cd941934d098654fa21a13f28346412",
+        "GUID:3e5d614bc16b50d41bd94c8d7444ca46"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],