Merge pull request #408 from hiroj/fix_createTextureItem

Changed to be able to extend texture loader.
vrm-c · May 22, 2020 · dde0f1d · dde0f1d
2 parents 582461e + c7eefa5
commit dde0f1d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
@@ -394,7 +394,7 @@ public void Load(string path, byte[] bytes)
             Root.name = Path.GetFileNameWithoutExtension(path);
         }
 
-        public void CreateTextureItems(UnityPath imageBaseDir = default(UnityPath))
+        public virtual void CreateTextureItems(UnityPath imageBaseDir = default(UnityPath))
         {
             if (m_textures.Any())
             {

diff --git a/Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs b/Assets/VRM/UniGLTF/Scripts/IO/TextureItem.cs
@@ -110,13 +110,25 @@ public IEnumerable<Texture2D> GetTexturesForSaveAssets()
         /// Texture from buffer
         /// </summary>
         /// <param name="index"></param>
-        public TextureItem(int index)
+        public TextureItem(int index, ITextureLoader textureLoader = null)
         {
             m_textureIndex = index;
+            if(textureLoader == null)
+            {
+                m_textureLoader = CreateTextureLoader(index);
+            }
+            else
+            {
+                m_textureLoader = textureLoader;
+            }
+        }
+
+        private static ITextureLoader CreateTextureLoader(int index)
+        {
 #if UNIGLTF_USE_WEBREQUEST_TEXTURELOADER
-            m_textureLoader = new UnityWebRequestTextureLoader(m_textureIndex);
+            return new UnityWebRequestTextureLoader(index);
 #else
-            m_textureLoader = new TextureLoader(m_textureIndex);
+            return new TextureLoader(index);
 #endif
         }