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

Merge pull request #1978 from ousttrue/fix_exporter_texture_leak

Browse Source 
Fix exporter texture leak
This commit is contained in:
ousttrue 2023-02-09 19:04:34 +09:00 committed by GitHub
commit d86730cd8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs
View File

@ -144,6 +144,8 @@ namespace UniGLTF
{
GameObject.Destroy(Copy);
}
_textureExporter.Dispose();
}
#region Export

4
Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System;
using UnityEngine;
namespace VRMShaders
@ -8,7 +8,7 @@ namespace VRMShaders
///
/// glTF 拡張で Texture の用途を増やす必要がある場合は、この interface を継承して実装すればよい。
/// </summary>
public interface ITextureExporter
public interface ITextureExporter: IDisposable
{
/// <summary>
/// 指定の Texture を、 sRGB 色空間の値を持つ Texture に出力するように指示する。

6
Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExportParam.cs
View File

@ -12,9 +12,11 @@ namespace VRMShaders
public float OptionFactor { get; }
public bool NeedsAlpha { get; set; }
public Func<Texture2D> Creator { get; set; }
public Func<(Texture2D, bool IsDisposable)> Creator { get; set; }
public TextureExportParam(TextureExportTypes exportType, ColorSpace exportColorSpace, Texture primaryTexture, Texture secondaryTexture, float optionFactor, bool needsAlpha, Func<Texture2D> creator)
public TextureExportParam(TextureExportTypes exportType, ColorSpace exportColorSpace,
Texture primaryTexture, Texture secondaryTexture, float optionFactor, bool needsAlpha,
Func<(Texture2D, bool IsDisposable)> creator)
{
ExportType = exportType;
ExportColorSpace = exportColorSpace;

37
Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs
View File

@ -8,10 +8,11 @@ namespace VRMShaders
/// glTF にエクスポートする変換方式を蓄えて index を確定させる。
/// Exporter の最後で Export() でまとめて変換する。
/// </summary>
public sealed class TextureExporter : IDisposable, ITextureExporter
public sealed class TextureExporter : ITextureExporter
{
private readonly ITextureSerializer _textureSerializer;
private readonly List<TextureExportParam> _exportingList = new List<TextureExportParam>();
private readonly List<UnityEngine.Texture2D> _disposables = new List<UnityEngine.Texture2D>();
public TextureExporter(ITextureSerializer textureSerializer)
{
@ -20,6 +21,22 @@ namespace VRMShaders
public void Dispose()
{
foreach (var o in _disposables)
{
if (Application.isEditor)
{
GameObject.DestroyImmediate(o);
}
else
{
GameObject.Destroy(o);
}
}
}
private void PushDisposable(UnityEngine.Texture2D disposable)
{
_disposables.Add(disposable);
}
/// <summary>
@ -31,7 +48,11 @@ namespace VRMShaders
for (var idx = 0; idx < _exportingList.Count; ++idx)
{
var exporting = _exportingList[idx];
var texture = exporting.Creator();
var (texture, isDisposable) = exporting.Creator();
if (isDisposable)
{
PushDisposable(texture);
}
exportedTextures.Add((texture, exporting.ExportColorSpace));
}
return exportedTextures;
@ -98,8 +119,8 @@ namespace VRMShaders
{
_textureSerializer.ModifyTextureAssetBeforeExporting(metallicSmoothTexture);
_textureSerializer.ModifyTextureAssetBeforeExporting(occlusionTexture);
return OcclusionMetallicRoughnessConverter.Export(metallicSmoothTexture, smoothness,
occlusionTexture);
return (OcclusionMetallicRoughnessConverter.Export(metallicSmoothTexture, smoothness,
occlusionTexture), true);
});
if (TryGetExistsParam(param, out var existsIdx))
{
@ -125,7 +146,7 @@ namespace VRMShaders
false, () =>
{
_textureSerializer.ModifyTextureAssetBeforeExporting(src);
return NormalConverter.Export(src);
return (NormalConverter.Export(src), true);
});
if (TryGetExistsParam(param, out var existsIdx))
{
@ -142,10 +163,11 @@ namespace VRMShaders
}
}
private Texture2D ConvertTextureSimple(Texture src, bool needsAlpha, ColorSpace exportColorSpace)
private (Texture2D, bool IsDisposable) ConvertTextureSimple(Texture src, bool needsAlpha, ColorSpace exportColorSpace)
{
// get Texture2D
var texture2D = src as Texture2D;
var isDisposable = false;
if (_textureSerializer.CanExportAsEditorAssetFile(texture2D, exportColorSpace))
{
// NOTE: 生のファイルとして出力可能な場合、何もせずそのまま Texture2D を渡す。
@ -156,8 +178,9 @@ namespace VRMShaders
{
_textureSerializer.ModifyTextureAssetBeforeExporting(src);
texture2D = TextureConverter.CopyTexture(src, exportColorSpace, needsAlpha, null);
isDisposable = true;
}
return texture2D;
return (texture2D, isDisposable);
}
private bool TryGetExistsParam(TextureExportParam param, out int existsIdx)