From 73763f713bfe6ef7cdc7a4d7d8e2559981f77bb6 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 16 Jun 2021 18:55:10 +0900 Subject: [PATCH] IReadOnlyList --- .../UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs | 12 +++++++----- Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs index e052bbb77..e1ae55c69 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs @@ -16,14 +16,16 @@ namespace UniGLTF /// public GameObject Root => this.gameObject; - public List<(SubAssetKey, UnityEngine.Object)> Resources = new List<(SubAssetKey, UnityEngine.Object)>(); + List<(SubAssetKey, UnityEngine.Object)> m_resources = new List<(SubAssetKey, UnityEngine.Object)>(); + + public IReadOnlyList<(SubAssetKey, UnityEngine.Object)> OwnedResources => m_resources; public static RuntimeGltfInstance AttachTo(GameObject go, ImporterContext context) { var loaded = go.AddComponent(); context.TransferOwnership((k, o) => { - loaded.Resources.Add((k, o)); + loaded.m_resources.Add((k, o)); }); return loaded; } @@ -47,7 +49,7 @@ namespace UniGLTF void OnDestroy() { Debug.Log("UnityResourceDestroyer.OnDestroy"); - foreach (var (key, x) in Resources) + foreach (var (key, x) in m_resources) { UnityObjectDestoyer.DestroyRuntimeOrEditor(x); } @@ -55,10 +57,10 @@ namespace UniGLTF public void TransferOwnership(TakeResponsibilityForDestroyObjectFunc take) { - foreach (var (key, x) in Resources.ToArray()) + foreach (var (key, x) in m_resources.ToArray()) { take(key, x); - Resources.Remove((key, x)); + m_resources.Remove((key, x)); } } diff --git a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs index 9e0821ccb..ad042ed16 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs @@ -94,7 +94,7 @@ namespace UniGLTF using (var context = new ImporterContext(parser)) { var instance = context.Load(); - var textureMap = instance.Resources + var textureMap = instance.RuntimeResources .Select(kv => (kv.Item1, kv.Item2 as Texture)) .Where(kv => kv.Item2 != null) .ToDictionary(kv => kv.Item1, kv => kv.Item2)