Merge pull request #433 from ousttrue/exporter_use_jpg

EditorExport時にアセットが見つかったTextureは、それを使う
vrm-c · Jun 16, 2020 · 7a7925d · 7a7925d
2 parents 348f4af + 8b4bae8
commit 7a7925d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs b/Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs
@@ -57,6 +57,14 @@ public int CopyAndGetIndex(Texture texture, RenderTextureReadWrite readWrite)
                 return -1;
             }
 
+#if UNITY_EDITOR
+            if (!string.IsNullOrEmpty(UnityEditor.AssetDatabase.GetAssetPath(texture)))
+            {
+                m_exportTextures[index] = texture;
+                return index;
+            }
+#endif
+
             // ToDo: may already exists
             m_exportTextures[index] = TextureItem.CopyTexture(texture, readWrite, null);
 

diff --git a/Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs b/Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs
@@ -129,7 +129,15 @@ static BytesWithMime GetBytesWithMime(Texture texture, glTFTextureTypes textureT
                         Bytes = System.IO.File.ReadAllBytes(path.FullPath),
                         Mime = "image/png",
                     };
-                }                    
+                }
+                if (path.Extension == ".jpg")
+                {
+                    return new BytesWithMime
+                    {
+                        Bytes = System.IO.File.ReadAllBytes(path.FullPath),
+                        Mime = "image/jpeg",
+                    };
+                }
             }
 #endif