BytesWithPath to BytesWithMime

ousttrue · Sep 21, 2018 · 2d70847 · 2d70847
1 parent 4005bde
commit 2d70847
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/Core/Scripts/IO/TextureIO.cs b/Core/Scripts/IO/TextureIO.cs
@@ -109,38 +109,43 @@ public static IEnumerable<TextureExportItem> GetTextures(Material m)
             }
         }
 
-        struct BytesWithPath
+
+        struct BytesWithMime
         {
             public Byte[] Bytes;
-            //public string Path;
             public string Mime;
+        }
 
-            public BytesWithPath(Texture texture, glTFTextureTypes textureType)
-            {
+        static BytesWithMime GetBytesWithMime(Texture texture, glTFTextureTypes textureType)
+        {
 #if UNITY_EDITOR
-                var path = UnityPath.FromAsset(texture);
-                if (path.IsUnderAssetsFolder)
+            var path = UnityPath.FromAsset(texture);
+            if (path.IsUnderAssetsFolder)
+            {
+                if (path.Extension == ".png")
                 {
-                    if (path.Extension == ".png")
+                    return new BytesWithMime
                     {
-                        Bytes = System.IO.File.ReadAllBytes(path.FullPath);
-                        Mime = "image/png";
-                        return;
-                    }                    
-                }
-#endif
-                //Path = "";
-                Bytes = TextureItem.CopyTexture(texture, TextureIO.GetColorSpace(textureType), null).EncodeToPNG();
-                Mime = "image/png";
+                        Bytes = System.IO.File.ReadAllBytes(path.FullPath),
+                        Mime = "image/png",
+                    };
+                }                    
             }
+#endif
+
+            return new BytesWithMime
+            {
+                Bytes = TextureItem.CopyTexture(texture, TextureIO.GetColorSpace(textureType), null).EncodeToPNG(),
+                Mime = "image/png",
+            };
         }
 
         public static int ExportTexture(glTF gltf, int bufferIndex, Texture texture, glTFTextureTypes textureType)
         {
-            var bytesWithPath = new BytesWithPath(texture, textureType); ;
+            var bytesWithMime = GetBytesWithMime(texture, textureType); ;
 
             // add view
-            var view = gltf.buffers[bufferIndex].Append(bytesWithPath.Bytes, glBufferTarget.NONE);
+            var view = gltf.buffers[bufferIndex].Append(bytesWithMime.Bytes, glBufferTarget.NONE);
             var viewIndex = gltf.AddBufferView(view);
 
             // add image
@@ -149,7 +154,7 @@ public static int ExportTexture(glTF gltf, int bufferIndex, Texture texture, glT
             {
                 name = texture.name,
                 bufferView = viewIndex,
-                mimeType = bytesWithPath.Mime,
+                mimeType = bytesWithMime.Mime,
             });
 
             // add sampler