diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/LoopAwaitable.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/NextFrameAwaitable.cs similarity index 87% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/LoopAwaitable.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/NextFrameAwaitable.cs index f6410a344..f1be89203 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/LoopAwaitable.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/NextFrameAwaitable.cs @@ -2,7 +2,7 @@ using System; namespace UniGLTF.AltTask { - public static class LoopAwaitable + public static class NextFrameAwaitable { // TODO // loop スレッド使わないようにしたい diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/LoopAwaitable.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/NextFrameAwaitable.cs.meta similarity index 83% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/LoopAwaitable.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/NextFrameAwaitable.cs.meta index 125c21d2f..498037b0f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/LoopAwaitable.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/AltTask/NextFrameAwaitable.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db36517c11c455e4b94d9cbb8c1cc3ff +guid: 81795a4f6e605d74787f604354a8565f MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs index 84e670fdd..1a2b6268f 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs @@ -98,7 +98,6 @@ namespace UniGLTF throw new UniGLTFNotSupportedException("draco is not supported"); } - // create textures using (MeasureTime("LoadTextures")) { for (int i = 0; i < GLTF.materials.Count; ++i) @@ -115,7 +114,6 @@ namespace UniGLTF await m_materialFactory.LoadMaterialsAsync(m_textureFactory.GetTextureAsync); } - // meshes var meshImporter = new MeshImporter(); for (int i = 0; i < GLTF.meshes.Count; ++i) { @@ -135,7 +133,7 @@ namespace UniGLTF Nodes.Add(NodeImporter.ImportNode(GLTF.nodes[i], i).transform); } } - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); using (MeasureTime("BuildHierarchy")) { @@ -160,7 +158,7 @@ namespace UniGLTF t.SetParent(Root.transform, false); } } - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); using (MeasureTime("AnimationImporter")) { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshImporter.cs index b3490ac34..aa35e5e27 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshImporter.cs @@ -631,9 +631,9 @@ namespace UniGLTF if (recalculateTangents) { - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); mesh.RecalculateTangents(); - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); } // 先にすべてのマテリアルを作成済みなのでテクスチャーは生成済み。Resultを使ってよい @@ -643,7 +643,7 @@ namespace UniGLTF Materials = meshContext.MaterialIndices.Select(x => ctx.GetMaterial(x)).ToArray() }; - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); if (meshContext.BlendShapes.Count > 0) { var emptyVertices = new Vector3[mesh.vertexCount]; diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs index 0fabe9f1e..79709b567 100644 --- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs +++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs @@ -39,26 +39,26 @@ namespace VRM { await LoadMetaAsync(); } - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); using (MeasureTime("VRM LoadHumanoid")) { LoadHumanoid(); } - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); using (MeasureTime("VRM LoadBlendShapeMaster")) { LoadBlendShapeMaster(); } - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); using (MeasureTime("VRM LoadSecondary")) { VRMSpringUtility.LoadSecondary(Root.transform, Nodes, VRM.secondaryAnimation); } - await LoopAwaitable.Create(); + await NextFrameAwaitable.Create(); using (MeasureTime("VRM LoadFirstPerson")) {