From 89276c2783faf4e4d99073ecdcf4ce9fd84c966f Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 11 Jun 2021 17:16:47 +0900 Subject: [PATCH] rename RuntimeGltfInstance --- .../UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs | 4 ++-- .../Runtime/UniGLTF/IO/ImporterContextExtensions.cs | 2 +- ...UnityObjectManager.cs => RuntimeGltfInstance.cs} | 13 +++++++------ ...tManager.cs.meta => RuntimeGltfInstance.cs.meta} | 2 +- Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs | 6 +++--- .../VRM/Editor/Format/VRMEditorImporterContext.cs | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) rename Assets/UniGLTF/Runtime/UniGLTF/{UnityObjectManager.cs => RuntimeGltfInstance.cs} (75%) rename Assets/UniGLTF/Runtime/UniGLTF/{UnityObjectManager.cs.meta => RuntimeGltfInstance.cs.meta} (83%) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs index 9a3666f1c..9b72a9603 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs @@ -61,7 +61,7 @@ namespace UniGLTF }; #region Load. Build unity objects - public virtual async Task LoadAsync(IAwaitCaller awaitCaller = null, Func MeasureTime = null) + public virtual async Task LoadAsync(IAwaitCaller awaitCaller = null, Func MeasureTime = null) { if (awaitCaller == null) { @@ -109,7 +109,7 @@ namespace UniGLTF await OnLoadHierarchy(awaitCaller, MeasureTime); - return UnityObjectManager.AttachTo(Root, this); + return RuntimeGltfInstance.AttachTo(Root, this); } /// diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs index 8b3bbe165..180a91d84 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs @@ -8,7 +8,7 @@ namespace UniGLTF /// /// Build unity objects from parsed gltf /// - public static UnityObjectManager Load(this ImporterContext self) + public static RuntimeGltfInstance Load(this ImporterContext self) { var meassureTime = new ImporterContextSpeedLog(); var task = self.LoadAsync(default(ImmediateCaller), meassureTime.MeasureTime); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs similarity index 75% rename from Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs rename to Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs index 40e6d6dda..283b3f90a 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs @@ -1,14 +1,15 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using VRMShaders; namespace UniGLTF { /// - /// Mesh, Material, Texture などを抱えておいて確実に破棄できるようにする + /// ImporterContext の Load 結果の GltfModel + /// + /// Runtime でモデルを Destory したときに関連リソース(Texture, Material...などの UnityEngine.Object)を自動的に Destroy する。 /// - public class UnityObjectManager : MonoBehaviour, IResponsibilityForDestroyObjects + public class RuntimeGltfInstance : MonoBehaviour, IResponsibilityForDestroyObjects { /// /// this is UniGLTF root gameObject @@ -17,9 +18,9 @@ namespace UniGLTF List<(SubAssetKey, UnityEngine.Object)> m_resources = new List<(SubAssetKey, UnityEngine.Object)>(); - public static UnityObjectManager AttachTo(GameObject go, ImporterContext context) + public static RuntimeGltfInstance AttachTo(GameObject go, ImporterContext context) { - var loaded = go.AddComponent(); + var loaded = go.AddComponent(); context.TransferOwnership((k, o) => { loaded.m_resources.Add((k, o)); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs.meta similarity index 83% rename from Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs.meta index 13de66798..af47451a0 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a396b6305c6ed494bad94f21d359e774 +guid: 423fb0cccbe420047ac28163cce68db4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs b/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs index 5058281d7..bb5ad6e96 100644 --- a/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs +++ b/Assets/VRM.Samples/Scripts/VRMRuntimeLoader.cs @@ -97,7 +97,7 @@ namespace VRM.Samples Debug.LogFormat("meta: title:{0}", meta.Title); // ParseしたJSONをシーンオブジェクトに変換していく - var loaded = default(UnityObjectManager); + var loaded = default(RuntimeGltfInstance); if (m_loadAsync) { loaded = await context.LoadAsync(); @@ -136,7 +136,7 @@ namespace VRM.Samples parser.ParseGlb(bytes); var context = new VRMImporterContext(parser); - var loaded = default(UnityObjectManager); + var loaded = default(RuntimeGltfInstance); if (m_loadAsync) { loaded = await context.LoadAsync(); @@ -167,7 +167,7 @@ namespace VRM.Samples #endif } - void OnLoaded(UnityObjectManager loaded) + void OnLoaded(RuntimeGltfInstance loaded) { var root = loaded.gameObject; diff --git a/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs b/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs index 5ee95bc43..552bff92d 100644 --- a/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs +++ b/Assets/VRM/Editor/Format/VRMEditorImporterContext.cs @@ -129,7 +129,7 @@ namespace VRM } } - public void SaveAsAsset(UniGLTF.UnityObjectManager loaded) + public void SaveAsAsset(UniGLTF.RuntimeGltfInstance loaded) { loaded.ShowMeshes();