From 8aff63c61ae2c4acd9b4f731046834a13c65ed57 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Thu, 19 Apr 2018 02:23:44 +0900
Subject: [PATCH] fix api ussage. remove dataChunk arguments

---
 Scripts/Editor/VRMTest.cs                     |  2 +-
 Scripts/Format/VRMImporter.cs                 | 30 ++++++++-----------
 Scripts/Format/VRMImporterContext.cs          |  4 +--
 .../Scripts/VRMRuntimeLoader.cs               | 10 +++----
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/Scripts/Editor/VRMTest.cs b/Scripts/Editor/VRMTest.cs
index 6f475dd31..f62f0a32b 100644
--- a/Scripts/Editor/VRMTest.cs
+++ b/Scripts/Editor/VRMTest.cs
@@ -61,7 +61,7 @@ public class VRMTest
                 // import
                 context.Json = gltf.ToJson();
                 Debug.LogFormat("{0}", context.Json);
-                gltfImporter.Import<glTF>(context, new ArraySegment<byte>());
+                gltfImporter.Import<glTF>(context);
 
                 AssertAreEqual(go.transform, context.Root.transform);
             }
diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs
index b03d7a4c6..9808ab9d9 100644
--- a/Scripts/Format/VRMImporter.cs
+++ b/Scripts/Format/VRMImporter.cs
@@ -18,30 +18,30 @@ namespace VRM
         public static GameObject LoadFromPath(string path)
         {
             var context = new VRMImporterContext(path);
-            var dataChunk = context.ParseVrm(File.ReadAllBytes(path));
-            LoadFromBytes(context, dataChunk);
+            context.ParseVrm(File.ReadAllBytes(path));
+            LoadFromBytes(context);
             return context.Root;
         }
 
         public static GameObject LoadFromBytes(Byte[] bytes)
         {
             var context = new VRMImporterContext();
-            var dataChunk = context.ParseVrm(bytes);
-            LoadFromBytes(context, dataChunk);
+            context.ParseVrm(bytes);
+            LoadFromBytes(context);
             return context.Root;
         }
 
         public static void LoadFromPath(VRMImporterContext context)
         {
-            var dataChunk = context.ParseVrm(File.ReadAllBytes(context.Path));
-            LoadFromBytes(context, dataChunk);
+            context.ParseVrm(File.ReadAllBytes(context.Path));
+            LoadFromBytes(context);
         }
 
-        public static void LoadFromBytes(VRMImporterContext context, ArraySegment<byte> dataChunk)
+        public static void LoadFromBytes(VRMImporterContext context)
         {
             context.CreateMaterial = VRMImporter.GetMaterialFunc(glTF_VRM_Material.Parse(context.Json));
 
-            gltfImporter.Import<glTF_VRM>(context, dataChunk);
+            gltfImporter.Import<glTF_VRM>(context);
             if (string.IsNullOrEmpty(context.Path))
             {
                 if (string.IsNullOrEmpty(context.VRM.extensions.VRM.meta.title))
@@ -526,18 +526,18 @@ namespace VRM
         public static void LoadVrmAsync(string path, Action<GameObject> onLoaded)
         {
             var context = new VRMImporterContext(path);
-            var dataChunk = context.ParseVrm(File.ReadAllBytes(path));
-            LoadVrmAsync(context, dataChunk, onLoaded);
+            context.ParseVrm(File.ReadAllBytes(path));
+            LoadVrmAsync(context, onLoaded);
         }
 
         public static void LoadVrmAsync(Byte[] bytes, Action<GameObject> onLoaded)
         {
             var context = new VRMImporterContext();
-            var dataChunk = context.ParseVrm(bytes);
-            LoadVrmAsync(context, dataChunk, onLoaded);
+            context.ParseVrm(bytes);
+            LoadVrmAsync(context, onLoaded);
         }
 
-        public static void LoadVrmAsync(VRMImporterContext ctx, ArraySegment<Byte> chunkData, Action<GameObject> onLoaded)
+        public static void LoadVrmAsync(VRMImporterContext ctx, Action<GameObject> onLoaded)
         {
             var schedulable = Schedulable.Create();
 
@@ -545,10 +545,6 @@ namespace VRM
                 .AddTask(Scheduler.ThreadPool, () =>
                 {
                     ctx.GLTF.baseDir = Path.GetDirectoryName(ctx.Path);
-                    foreach (var buffer in ctx.GLTF.buffers)
-                    {
-                        buffer.OpenStorage(ctx.GLTF.baseDir, chunkData);
-                    }
                     return Unit.Default;
                 })
                 .ContinueWith(Scheduler.ThreadPool, _ =>
diff --git a/Scripts/Format/VRMImporterContext.cs b/Scripts/Format/VRMImporterContext.cs
index 3de95b0b0..c986b1156 100644
--- a/Scripts/Format/VRMImporterContext.cs
+++ b/Scripts/Format/VRMImporterContext.cs
@@ -29,9 +29,9 @@ namespace VRM
             }
         }
 
-        public System.ArraySegment<byte> ParseVrm(byte[] bytes)
+        public void ParseVrm(byte[] bytes)
         {
-            return ParseGlb<glTF_VRM>(bytes);
+            ParseGlb<glTF_VRM>(bytes);
         }
 
         public VRMMetaObject ReadMeta()
diff --git a/_RuntimeLoaderSample/Scripts/VRMRuntimeLoader.cs b/_RuntimeLoaderSample/Scripts/VRMRuntimeLoader.cs
index 0aac99739..289166051 100644
--- a/_RuntimeLoaderSample/Scripts/VRMRuntimeLoader.cs
+++ b/_RuntimeLoaderSample/Scripts/VRMRuntimeLoader.cs
@@ -88,7 +88,7 @@ namespace VRM
             var context = new VRMImporterContext(path);
 
             // GLB形式でJSONを取得しParseします
-            var dataChunk = context.ParseVrm(bytes);
+            context.ParseVrm(bytes);
 
 
             // metaを取得(todo: thumbnailテクスチャのロード)
@@ -99,11 +99,11 @@ namespace VRM
             // ParseしたJSONをシーンオブジェクトに変換していく
             if (m_loadAsync)
             {
-                LoadAsync(context, dataChunk);
+                LoadAsync(context);
             }
             else
             {
-                VRMImporter.LoadFromBytes(context, dataChunk);
+                VRMImporter.LoadFromBytes(context);
                 OnLoaded(context.Root);
             }
         }
@@ -154,11 +154,11 @@ namespace VRM
         }
 
 
-        void LoadAsync(VRMImporterContext context, ArraySegment<byte> dataChunk)
+        void LoadAsync(VRMImporterContext context)
         {
 #if true
             var now = Time.time;
-            VRMImporter.LoadVrmAsync(context, dataChunk, go=> {
+            VRMImporter.LoadVrmAsync(context, go=> {
                 var delta = Time.time - now;
                 Debug.LogFormat("LoadVrmAsync {0:0.0} seconds", delta);
                 OnLoaded(go);