Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-09 12:11:35 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #646 from ousttrue/fix/TakeScreenShot

Browse Source 
スクリーンショット作成時に、JpegEncodeしているのに拡張子がpng
This commit is contained in:
hiroj 2021-01-04 17:18:42 +09:00 committed by GitHub
commit bfde101c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs
View File

@ -234,7 +234,7 @@ namespace VRM
void TakeScreenShot()
{
var dst = SaveDialog(m_target, "png");
var dst = SaveDialog(m_target, "png", "jpg");
if (string.IsNullOrEmpty(dst))
{
return;
@ -251,7 +251,19 @@ namespace VRM
Camera.main.Render();
tex.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0);
tex.Apply();
File.WriteAllBytes(dst, tex.EncodeToJPG());
var ext = Path.GetExtension(dst).ToLower();
switch (ext)
{
case ".png":
File.WriteAllBytes(dst, tex.EncodeToPNG());
break;
case ".jpg":
File.WriteAllBytes(dst, tex.EncodeToJPG());
break;
}
var assetPath = MeshUtility.UnityPath.FromFullpath(dst);
EditorApplication.delayCall += () =>
{
@ -268,7 +280,7 @@ namespace VRM
}
}
static string SaveDialog(VRMMetaObject meta, string ext)
static string SaveDialog(VRMMetaObject meta, params string[] ext)
{
var directory = Application.dataPath;
var assetPath = AssetDatabase.GetAssetPath(meta);
@ -279,8 +291,8 @@ namespace VRM
return EditorUtility.SaveFilePanel(
"Save thumbnail",
directory,
$"thumbnail.{ext}",
ext);
$"thumbnail.{ext[0]}",
string.Join(",", ext));
}
static (Rect, Rect) FixedRight(Rect r, int width)