From 98193ab7562bd8bb344747953d8657c9fa24c816 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 18 Jun 2018 22:51:37 +0900 Subject: [PATCH] Modified storage interface --- Scripts/Editor/VRMTest.cs | 2 +- Scripts/Format/VRMImporter.cs | 6 +++--- Scripts/Format/VRMImporterContext.cs | 2 +- UniGLTF | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Scripts/Editor/VRMTest.cs b/Scripts/Editor/VRMTest.cs index 282629fda..ffc3ef331 100644 --- a/Scripts/Editor/VRMTest.cs +++ b/Scripts/Editor/VRMTest.cs @@ -59,7 +59,7 @@ public class VRMTest exporter.Export(); // import - context.ParseJson(gltf.ToJson(), new ArraySegment()); + context.ParseJson(gltf.ToJson(), new SimpleStorage()); Debug.LogFormat("{0}", context.Json); gltfImporter.Import(context); diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs index 9fc4f5bb2..4bae71ed8 100644 --- a/Scripts/Format/VRMImporter.cs +++ b/Scripts/Format/VRMImporter.cs @@ -405,12 +405,12 @@ namespace VRM #endregion #region LoadVrmAsync - static IEnumerator LoadTextures(VRMImporterContext context) + static IEnumerator LoadTextures(VRMImporterContext context, IStorage storage) { for(int i=0; i { var texture = new TextureItem(ctx.GLTF, index); - texture.Process(); + texture.Process(ctx.Storage); return texture; }) .ContinueWith(Scheduler.ThreadPool, x => ctx.Textures.Add(x)); diff --git a/Scripts/Format/VRMImporterContext.cs b/Scripts/Format/VRMImporterContext.cs index 20acf4a93..ef74c3357 100644 --- a/Scripts/Format/VRMImporterContext.cs +++ b/Scripts/Format/VRMImporterContext.cs @@ -58,7 +58,7 @@ namespace VRM if(gltfMeta.texture >= 0 && gltfMeta.texture < VRM.textures.Count) { var t = new TextureItem(VRM, gltfMeta.texture); - t.Process(); + t.Process(Storage); meta.Thumbnail=t.Texture; } } diff --git a/UniGLTF b/UniGLTF index fb17653c8..673a00366 160000 --- a/UniGLTF +++ b/UniGLTF @@ -1 +1 @@ -Subproject commit fb17653c83e7942c0d1bd53305fdc875fa1a6eb2 +Subproject commit 673a003669e78333cfc27c78417c797784fe9a36