diff --git a/Assets/UniGLTF/Runtime/SpringBoneJobs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs.meta new file mode 100644 index 000000000..a8aff4cbc --- /dev/null +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e65343205e21bc24b98dbdb05ee56f01 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableCollider.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableCollider.cs similarity index 83% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableCollider.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableCollider.cs index 1f88e7fee..186d478ef 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableCollider.cs +++ b/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 { /// /// Blittableなコライダ diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableCollider.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableCollider.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableCollider.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableCollider.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableColliderType.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableColliderType.cs similarity index 75% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableColliderType.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableColliderType.cs index 69ea0f91d..66e91a246 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableColliderType.cs +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableColliderType.cs @@ -1,4 +1,4 @@ -namespace UniVRM10.FastSpringBones.Blittables +namespace UniGLTF.SpringBoneJobs.Blittables { public enum BlittableColliderType { diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableColliderType.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableColliderType.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableColliderType.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableColliderType.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableExternalData.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableExternalData.cs similarity index 88% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableExternalData.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableExternalData.cs index d79789c5f..17ba54e07 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableExternalData.cs +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableExternalData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace UniVRM10.FastSpringBones.Blittables +namespace UniGLTF.SpringBoneJobs.Blittables { /// /// 外力等の毎フレーム更新されうる外部から与えられる情報 diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableExternalData.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableExternalData.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableExternalData.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableExternalData.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableJoint.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableJoint.cs similarity index 88% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableJoint.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableJoint.cs index 3a670b0e0..c7d79a95d 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableJoint.cs +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableJoint.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace UniVRM10.FastSpringBones.Blittables +namespace UniGLTF.SpringBoneJobs.Blittables { /// /// SpringBoneの各関節を表すデータ型 diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableJoint.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableJoint.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableJoint.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableJoint.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableLogic.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableLogic.cs similarity index 90% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableLogic.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableLogic.cs index 31397d8c7..547ca4cbe 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableLogic.cs +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableLogic.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace UniVRM10.FastSpringBones.Blittables +namespace UniGLTF.SpringBoneJobs.Blittables { /// /// SpringBoneの各関節に紐付いた計算情報を表すデータ型 diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableLogic.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableLogic.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableLogic.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableLogic.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpan.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpan.cs similarity index 74% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpan.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpan.cs index 37a0f2962..1d00e351a 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpan.cs +++ b/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 diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpan.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpan.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpan.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpan.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpring.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpring.cs similarity index 90% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpring.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpring.cs index bd145fa04..b1cdfa14c 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpring.cs +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpring.cs @@ -1,6 +1,6 @@ using System; -namespace UniVRM10.FastSpringBones.Blittables +namespace UniGLTF.SpringBoneJobs.Blittables { /// /// 1本の毛束を表すデータ型 diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpring.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpring.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableSpring.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableSpring.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableTransform.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableTransform.cs similarity index 91% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableTransform.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableTransform.cs index 2c3745d34..786aa0bb2 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableTransform.cs +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableTransform.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace UniVRM10.FastSpringBones.Blittables +namespace UniGLTF.SpringBoneJobs.Blittables { /// /// Transformの必要な機能だけを絞り、Blittableに対応させたクラス diff --git a/Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableTransform.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableTransform.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/Blittables/BlittableTransform.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/Blittables/BlittableTransform.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneBufferCombiner.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneBufferCombiner.cs similarity index 98% rename from Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneBufferCombiner.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneBufferCombiner.cs index ce2fb53a0..82d400e8a 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneBufferCombiner.cs +++ b/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 { /// /// FastSpringBoneの処理に利用するバッファを全て結合して持つクラス diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneBufferCombiner.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneBufferCombiner.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneBufferCombiner.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneBufferCombiner.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneBuffer.cs similarity index 99% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneBuffer.cs index 6d1c55c8b..99785caf8 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs +++ b/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 { /// /// ひとつのVRMに紐づくFastSpringBoneに関連したバッファを保持するクラス diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneBuffer.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneBuffer.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneBuffer.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneCollider.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneCollider.cs similarity index 68% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneCollider.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneCollider.cs index b8386924c..942abe439 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneCollider.cs +++ b/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 diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneCollider.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneCollider.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneCollider.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneCollider.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneJoint.cs similarity index 72% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneJoint.cs index 98d1a8e65..69cb51a80 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs +++ b/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 diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneJoint.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneJoint.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneJoint.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneSpring.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneSpring.cs similarity index 83% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneSpring.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneSpring.cs index 6be893391..3838f8ef1 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneSpring.cs +++ b/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 diff --git a/Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneSpring.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneSpring.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/InputPorts/FastSpringBoneSpring.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneSpring.cs.meta diff --git a/Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs new file mode 100644 index 000000000..f9074868c --- /dev/null +++ b/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 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 + }; + } + } +} + \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs.meta new file mode 100644 index 000000000..78bdc82fe --- /dev/null +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/PullTransformJob.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b9fd53b4431b41909c1b1d882a2d446b +timeCreated: 1633072084 \ No newline at end of file diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/PushTransformJob.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/PushTransformJob.cs similarity index 84% rename from Assets/VRM10/Runtime/FastSpringBone/System/PushTransformJob.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/PushTransformJob.cs index cc19b6fa2..aa8e2816d 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/PushTransformJob.cs +++ b/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] diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/PushTransformJob.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/PushTransformJob.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/System/PushTransformJob.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/PushTransformJob.cs.meta diff --git a/Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef b/Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef new file mode 100644 index 000000000..2954f7f79 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef.meta new file mode 100644 index 000000000..9317f137a --- /dev/null +++ b/Assets/UniGLTF/Runtime/SpringBoneJobs/SpringBoneJobs.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e5d614bc16b50d41bd94c8d7444ca46 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs b/Assets/UniGLTF/Runtime/SpringBoneJobs/UpdateFastSpringBoneJob.cs similarity index 99% rename from Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs rename to Assets/UniGLTF/Runtime/SpringBoneJobs/UpdateFastSpringBoneJob.cs index cc0694514..05011e8f0 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs +++ b/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] diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs.meta b/Assets/UniGLTF/Runtime/SpringBoneJobs/UpdateFastSpringBoneJob.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs.meta rename to Assets/UniGLTF/Runtime/SpringBoneJobs/UpdateFastSpringBoneJob.cs.meta diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeSpringBone.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeSpringBone.cs index 335f0c986..9e0819b6a 100644 --- a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeSpringBone.cs +++ b/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 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(); } } diff --git a/Assets/VRM10/Runtime/FastSpringBone/FastSpringBone10.asmdef b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBone10.asmdef index 70ab6d305..85b7135ac 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/FastSpringBone10.asmdef +++ b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBone10.asmdef @@ -1,7 +1,9 @@ { "name": "FastSpringBone10", + "rootNamespace": "", "references": [ - "GUID:2665a8d13d1b3f18800f46e256720795" + "GUID:2665a8d13d1b3f18800f46e256720795", + "GUID:3e5d614bc16b50d41bd94c8d7444ca46" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneScheduler.cs b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneScheduler.cs similarity index 96% rename from Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneScheduler.cs rename to Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneScheduler.cs index f3adb0bad..207672c08 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneScheduler.cs +++ b/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 { diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneScheduler.cs.meta b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneScheduler.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneScheduler.cs.meta rename to Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneScheduler.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneService.cs b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneService.cs similarity index 97% rename from Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneService.cs rename to Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneService.cs index aef3a652f..b97b556d7 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneService.cs +++ b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneService.cs @@ -1,6 +1,7 @@ +using UniGLTF.SpringBoneJobs; using UnityEngine; -namespace UniVRM10.FastSpringBones.System +namespace UniVRM10.FastSpringBones { [DefaultExecutionOrder(11010)] /// diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneService.cs.meta b/Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneService.cs.meta similarity index 100% rename from Assets/VRM10/Runtime/FastSpringBone/System/FastSpringBoneService.cs.meta rename to Assets/VRM10/Runtime/FastSpringBone/FastSpringBoneService.cs.meta diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs b/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs index d31ec3326..c20affe18 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs +++ b/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 diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs.meta b/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs.meta index 78bdc82fe..ead1129cb 100644 --- a/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs.meta +++ b/Assets/VRM10/Runtime/FastSpringBone/System/CopyToNativeArrayTransformJob.cs.meta @@ -1,3 +1,11 @@ -fileFormatVersion: 2 -guid: b9fd53b4431b41909c1b1d882a2d446b -timeCreated: 1633072084 \ No newline at end of file +fileFormatVersion: 2 +guid: 6cbbe7ad561feca4fb8f91f999755d9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10/Runtime/VRM10.asmdef b/Assets/VRM10/Runtime/VRM10.asmdef index d07971ce9..5977538c1 100644 --- a/Assets/VRM10/Runtime/VRM10.asmdef +++ b/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": [],