Merge pull request #52 from hiroj/import_speed_up

Import speed up
ousttrue · Oct 12, 2018 · 8918a4f · 8918a4f
2 parents 975f06f + 0a24f80
commit 8918a4f
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 69 deletions.
diff --git a/Core/Scripts/IO/ImporterContext.cs b/Core/Scripts/IO/ImporterContext.cs
@@ -466,27 +466,9 @@ protected virtual Schedulable<Unit> LoadAsync()
                         //
                     }
                 })
-                .ContinueWithCoroutine(Scheduler.ThreadPool, () =>
-                {
-                    using (MeasureTime("TexturesProcessOnAnyThread"))
-                    {
-                        return TexturesProcessOnAnyThread();
-                    }
-                })
-                .ContinueWithCoroutine(Scheduler.MainThread, () =>
-                {
-                    using (MeasureTime("TexturesProcessOnMainThread"))
-                    {
-                        return TexturesProcessOnMainThread();
-                    }
-                })
-                .ContinueWithCoroutine(Scheduler.MainThread, () =>
-                {
-                    using (MeasureTime("LoadMaterials"))
-                    {
-                        return LoadMaterials();
-                    }
-                })
+                .ContinueWithCoroutine(Scheduler.ThreadPool, TexturesProcessOnAnyThread)
+                .ContinueWithCoroutine(Scheduler.MainThread, TexturesProcessOnMainThread)
+                .ContinueWithCoroutine(Scheduler.MainThread, LoadMaterials)
                 .OnExecute(Scheduler.ThreadPool, parent =>
                 {
                     if (GLTF.meshes
@@ -535,24 +517,15 @@ protected virtual Schedulable<Unit> LoadAsync()
                         ;
                     }
                 })
-                .ContinueWithCoroutine(Scheduler.MainThread, () =>
-                {
-                    using (MeasureTime("LoadNodes"))
-                    {
-                        return LoadNodes();
-                    }
-                })
-                .ContinueWithCoroutine(Scheduler.MainThread, () =>
+                .ContinueWithCoroutine(Scheduler.MainThread, LoadNodes)
+                .ContinueWithCoroutine(Scheduler.MainThread, BuildHierarchy)
+                .ContinueWith(Scheduler.MainThread, _ =>
                 {
-                    using (MeasureTime("BuildHierarchy"))
+                    using (MeasureTime("AnimationImporter"))
                     {
-                        return BuildHierarchy();
+                        AnimationImporter.ImportAnimation(this);
                     }
                 })
-                .ContinueWith(Scheduler.MainThread, _ =>
-                {
-                    AnimationImporter.ImportAnimation(this);
-                })
                 .ContinueWith(Scheduler.CurrentThread,
                     _ =>
                     {
@@ -569,36 +542,45 @@ protected virtual void OnLoadModel()
 
         IEnumerator TexturesProcessOnAnyThread()
         {
-            foreach (var x in GetTextures())
+            using (MeasureTime("TexturesProcessOnAnyThread"))
             {
-                x.ProcessOnAnyThread(GLTF, Storage);
-                yield return null;
+                foreach (var x in GetTextures())
+                {
+                    x.ProcessOnAnyThread(GLTF, Storage);
+                    yield return null;
+                }
             }
         }
 
         IEnumerator TexturesProcessOnMainThread()
         {
-            foreach (var x in GetTextures())
+            using (MeasureTime("TexturesProcessOnMainThread"))
             {
-                x.ProcessOnMainThread(GLTF);
-                yield return null;
+                foreach (var x in GetTextures())
+                {
+                    x.ProcessOnMainThread(GLTF);
+                    yield return null;
+                }
             }
         }
 
         IEnumerator LoadMaterials()
         {
-            if (GLTF.materials == null || !GLTF.materials.Any())
+            using (MeasureTime("LoadMaterials"))
             {
-                AddMaterial(MaterialImporter.CreateMaterial(0, null));
-            }
-            else
-            {
-                for (int i = 0; i < GLTF.materials.Count; ++i)
+                if (GLTF.materials == null || !GLTF.materials.Any())
                 {
-                    AddMaterial(MaterialImporter.CreateMaterial(i, GLTF.materials[i]));
-                    yield return null;
+                    AddMaterial(MaterialImporter.CreateMaterial(0, null));
+                }
+                else
+                {
+                    for (int i = 0; i < GLTF.materials.Count; ++i)
+                    {
+                        AddMaterial(MaterialImporter.CreateMaterial(i, GLTF.materials[i]));
+                    }
                 }
             }
+            yield return null;
         }
 
         IEnumerator LoadMeshes()
@@ -621,36 +603,42 @@ IEnumerator LoadMeshes()
 
         IEnumerator LoadNodes()
         {
-            foreach (var x in GLTF.nodes)
+            using (MeasureTime("LoadNodes"))
             {
-                Nodes.Add(NodeImporter.ImportNode(x).transform);
+                foreach (var x in GLTF.nodes)
+                {
+                    Nodes.Add(NodeImporter.ImportNode(x).transform);
+                }
             }
 
             yield return null;
         }
 
         IEnumerator BuildHierarchy()
         {
-            var nodes = new List<NodeImporter.TransformWithSkin>();
-            for (int i = 0; i < Nodes.Count; ++i)
+            using (MeasureTime("BuildHierarchy"))
             {
-                nodes.Add(NodeImporter.BuildHierarchy(this, i));
-            }
+                var nodes = new List<NodeImporter.TransformWithSkin>();
+                for (int i = 0; i < Nodes.Count; ++i)
+                {
+                    nodes.Add(NodeImporter.BuildHierarchy(this, i));
+                }
 
-            NodeImporter.FixCoordinate(this, nodes);
+                NodeImporter.FixCoordinate(this, nodes);
 
-            // skinning
-            for (int i = 0; i < nodes.Count; ++i)
-            {
-                NodeImporter.SetupSkinning(this, nodes, i);
-            }
+                // skinning
+                for (int i = 0; i < nodes.Count; ++i)
+                {
+                    NodeImporter.SetupSkinning(this, nodes, i);
+                }
 
-            // connect root
-            Root = new GameObject("_root_");
-            foreach (var x in GLTF.rootnodes)
-            {
-                var t = nodes[x].Transform;
-                t.SetParent(Root.transform, false);
+                // connect root
+                Root = new GameObject("_root_");
+                foreach (var x in GLTF.rootnodes)
+                {
+                    var t = nodes[x].Transform;
+                    t.SetParent(Root.transform, false);
+                }
             }
 
             yield return null;

diff --git a/Core/Scripts/IO/MeshImporter.cs b/Core/Scripts/IO/MeshImporter.cs
@@ -465,7 +465,7 @@ public static MeshWithMaterials BuildMesh(ImporterContext ctx, MeshImporter.Mesh
                         {
                             emptyVertices = new Vector3[mesh.vertexCount];
                         }
-                        Debug.LogFormat("empty blendshape: {0}.{1}", mesh.name, blendShape.Name);
+                        // Debug.LogFormat("empty blendshape: {0}.{1}", mesh.name, blendShape.Name);
                         // add empty blend shape for keep blend shape index
                         mesh.AddBlendShapeFrame(blendShape.Name, FRAME_WEIGHT,
                             emptyVertices,

diff --git a/Core/Scripts/IO/TextureItem.cs b/Core/Scripts/IO/TextureItem.cs
@@ -126,7 +126,9 @@ static Byte[] ToArray(ArraySegment<byte> bytes)
             }
             else
             {
-                return bytes.Array.Skip(bytes.Offset).Take(bytes.Count).ToArray();
+                Byte[] result = new byte[bytes.Count];
+                Buffer.BlockCopy(bytes.Array, bytes.Offset, result, 0, result.Length);
+                return result;
             }
         }