From 6d42ba01e3a42b5173be0159bc90f1f16ec6fedf Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 26 Jan 2023 15:18:07 +0900 Subject: [PATCH] remove IDisposableResourceList * UnityEngine.Object => UnityEngine.Texture2D --- .../GLTF/IO/Runtime/IDisposableResourceList.cs | 9 --------- .../GLTF/IO/Runtime/IDisposableResourceList.cs.meta | 11 ----------- .../IO/Runtime/Texture/Exporter/ITextureExporter.cs | 2 +- .../IO/Runtime/Texture/Exporter/TextureExporter.cs | 5 +++-- 4 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs delete mode 100644 Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs.meta diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs b/Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs deleted file mode 100644 index ce0942b72..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace VRMShaders -{ - public interface IDisposableResourceList : IDisposable - { - public void PushDisposable(UnityEngine.Object disposable); - } -} diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs.meta deleted file mode 100644 index 9ea1d664e..000000000 --- a/Assets/VRMShaders/GLTF/IO/Runtime/IDisposableResourceList.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 199f81cd0c31d644ca19fb747ea89584 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs index b0d300bfb..bb132fcae 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureExporter.cs @@ -8,7 +8,7 @@ namespace VRMShaders /// /// glTF 拡張で Texture の用途を増やす必要がある場合は、この interface を継承して実装すればよい。 /// - public interface ITextureExporter: IDisposableResourceList + public interface ITextureExporter: IDisposable { /// /// 指定の Texture を、 sRGB 色空間の値を持つ Texture に出力するように指示する。 diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs index b924bd696..0196bffa8 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs @@ -12,7 +12,7 @@ namespace VRMShaders { private readonly ITextureSerializer _textureSerializer; private readonly List _exportingList = new List(); - private readonly List _disposables = new List(); + private readonly List _disposables = new List(); public TextureExporter(ITextureSerializer textureSerializer) { @@ -33,7 +33,8 @@ namespace VRMShaders } } } - public void PushDisposable(UnityEngine.Object disposable) + + public void PushDisposable(UnityEngine.Texture2D disposable) { _disposables.Add(disposable); }