From 867177404b3f6bc67da469aeab1ebaa23070bf9d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 26 Sep 2024 14:29:50 +0900 Subject: [PATCH] =?UTF-8?q?SpringBone=E3=81=AE=E5=88=9D=E6=9C=9F=E5=8C=96?= =?UTF-8?q?=E3=82=92=E5=89=8D=E6=96=B9=E3=81=AB=E7=A7=BB=E5=8B=95=E3=81=97?= =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=A7=E3=80=81=E9=9D=9Eplay=E6=99=82?= =?UTF-8?q?=E3=81=AEDontDestroyOnLoad=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F=E3=80=82=E5=9B=9E?= =?UTF-8?q?=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Vrm10Runtime/Vrm10FastSpringboneRuntime.cs | 3 ++- Assets/VRM10/Runtime/IO/Vrm10Importer.cs | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10FastSpringboneRuntime.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10FastSpringboneRuntime.cs index d02e6ec97..11d70268c 100644 --- a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10FastSpringboneRuntime.cs +++ b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10FastSpringboneRuntime.cs @@ -14,7 +14,7 @@ namespace UniVRM10 public class Vrm10FastSpringboneRuntime : IVrm10SpringBoneRuntime { private Vrm10Instance m_instance; - private readonly FastSpringBones.FastSpringBoneService m_fastSpringBoneService = FastSpringBones.FastSpringBoneService.Instance; + private FastSpringBones.FastSpringBoneService m_fastSpringBoneService; private FastSpringBoneBuffer m_fastSpringBoneBuffer; public Vector3 ExternalForce @@ -32,6 +32,7 @@ namespace UniVRM10 public async Task InitializeAsync(Vrm10Instance instance, IAwaitCaller awaitCaller) { + m_fastSpringBoneService = FastSpringBones.FastSpringBoneService.Instance; m_instance = instance; // NOTE: FastSpringBoneService は UnitTest などでは動作しない diff --git a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs index 8347dbb11..be77bb089 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs @@ -273,8 +273,12 @@ namespace UniVRM10 if (UniGLTF.Extensions.VRMC_springBone.GltfDeserializer.TryGet(Data.GLTF.extensions, out UniGLTF.Extensions.VRMC_springBone.VRMC_springBone springBone)) { await LoadSpringBoneAsync(awaitCaller, controller, springBone); - // Vrm10Runtime で初期化していたが、 async にするためこちらに移動 v0.127 - await m_springboneRuntime.InitializeAsync(controller, awaitCaller); + if (Application.isPlaying) + { + // EditorImport では呼ばない + // Vrm10Runtime で初期化していたが、 async にするためこちらに移動 v0.127 + await m_springboneRuntime.InitializeAsync(controller, awaitCaller); + } } // constraint await LoadConstraintAsync(awaitCaller, controller);