Merge pull request #279 from KisaragiEffective/refactor/object-instantiate

Author: KisaragiEffective

Editor/Transform/AvatarTransformService.cs

@@ -50,27 +50,22 @@ private static GameObject Expand(
             bool runNDMF
         )
         {
-            // TODO: IPlatformExpanderではない
-            // TODO: 最初にInstantiateするならはじめっからinstantiateしておいて、modifiableRootを取るようにしたほうがI/F的にはきれいなのでは？
-            GameObject modifiableRoot = PerformEnvironmentDependantShallowCopy(new Environment.AAO.DisableMeshMerge(), unmodifiableRoot);
+            var modifiableRoot = Object.Instantiate(unmodifiableRoot);
+            modifiableRoot = PerformPreprocessor(new Environment.AAO.DisableMeshMerge(), modifiableRoot);
 
             if (runVRCSDKPipeline)
             {
-                modifiableRoot = PerformEnvironmentDependantShallowCopy(new Environment.VRChat.VRChatBuildPipelineExpander(), modifiableRoot);
+                modifiableRoot = PerformPreprocessor(new Environment.VRChat.VRChatBuildPipelinePreprocessor(), modifiableRoot);
             }
             else if (runNDMF)
             {
-                modifiableRoot = PerformEnvironmentDependantShallowCopy(new Environment.NDMF.StandaloneNDMFExpander(), modifiableRoot);
-            }
-            else
-            {
-                modifiableRoot = Object.Instantiate(modifiableRoot);
+                modifiableRoot = PerformPreprocessor(new Environment.NDMF.StandaloneNDMFPreprocessor(), modifiableRoot);
             }
 
             return modifiableRoot;
 
-            GameObject PerformEnvironmentDependantShallowCopy(IPlatformExpander handler, GameObject localUnmodifiableRoot) =>
-                handler.PerformEnvironmentDependantShallowCopy(localUnmodifiableRoot);
+            GameObject PerformPreprocessor(IPlatformDependantPreprocessor handler, GameObject localUnmodifiableRoot) =>
+                handler.Preprocess(localUnmodifiableRoot);
         }
 
         private static MultipleUnorderedDictionary<LoweredRenderMode, Material>

Editor/Transform/Environment/AAO/DisableMeshMerge.cs

@@ -8,13 +8,11 @@ namespace KisaragiMarine.ResoniteImportHelper.Transform.Environment.AAO
     /// <summary>
     /// UniGLTF に AAO MergeMesh したアバターを食わせるとメッシュが大幅に壊れる現象を回避するためのパス
     /// </summary>
-    public sealed class DisableMeshMerge : IPlatformExpander
+    public sealed class DisableMeshMerge : IPlatformDependantPreprocessor
     {
-        public GameObject PerformEnvironmentDependantShallowCopy(GameObject unmodifiableRoot)
+        public GameObject Preprocess(GameObject modifiableRoot)
         {
-            var root = Object.Instantiate(unmodifiableRoot);
-
-            var traceAndOptimizeComponents = root.GetComponents<Anatawa12.AvatarOptimizer.TraceAndOptimize>();
+            var traceAndOptimizeComponents = modifiableRoot.GetComponents<Anatawa12.AvatarOptimizer.TraceAndOptimize>();
 
             foreach (var tao in traceAndOptimizeComponents)
             {
@@ -23,12 +21,12 @@ public GameObject PerformEnvironmentDependantShallowCopy(GameObject unmodifiable
                 handle.ApplyModifiedPropertiesWithoutUndo();
             }
 
-            foreach (var mergeComponent in root.GetComponents<Anatawa12.AvatarOptimizer.MergeSkinnedMesh>())
+            foreach (var mergeComponent in modifiableRoot.GetComponents<Anatawa12.AvatarOptimizer.MergeSkinnedMesh>())
             {
                 Object.DestroyImmediate(mergeComponent);
             }
 
-            return root;
+            return modifiableRoot;
             // var mergeComponents = root.GetComponents<>();
         }
     }

Editor/Transform/Environment/Common/IPlatformDependantPreprocessor.cs

@@ -0,0 +1,15 @@
+#nullable enable
+using UnityEngine;
+
+namespace KisaragiMarine.ResoniteImportHelper.Transform.Environment.Common
+{
+    /// <summary>
+    /// プラットフォーム依存の方法で<see cref="GameObject"/>に対して変更を加える。
+    /// </summary>
+    public interface IPlatformDependantPreprocessor
+    {
+        /// <see cref="GameObject.Instantiate(Object)"/> を呼び出すときは必ず適切な後始末をしなければならない。
+        /// <returns>変更が適用された<see cref="GameObject"/></returns>
+        public GameObject Preprocess(GameObject modifiableRoot);
+    }
+}

Editor/Transform/Environment/Common/IPlatformExpander.cs.meta renamed to Editor/Transform/Environment/Common/IPlatformDependantPreprocessor.cs.meta

@@ -8,13 +8,13 @@
 namespace KisaragiMarine.ResoniteImportHelper.Transform.Environment.NDMF
 {
     // ReSharper disable once InconsistentNaming
-    internal class StandaloneNDMFExpander: IPlatformExpander
+    internal class StandaloneNDMFPreprocessor: IPlatformDependantPreprocessor
     {
 
-        public GameObject PerformEnvironmentDependantShallowCopy(GameObject unmodifiableRoot)
+        public GameObject Preprocess(GameObject modifiableRoot)
         {
 #if RIH_HAS_NDMF
-            return AvatarProcessor.ProcessAvatarUI(unmodifiableRoot);
+            return AvatarProcessor.ProcessAvatarUI(modifiableRoot);
 #else
             throw new ResoniteImportHelper.Transform.Environment.Common.NonEnabledPlatformException();
 #endif

Editor/Transform/Environment/Common/IPlatformExpander.cs

@@ -10,20 +10,18 @@
 
 namespace KisaragiMarine.ResoniteImportHelper.Transform.Environment.VRChat
 {
-    internal class VRChatBuildPipelineExpander : IPlatformExpander
+    internal class VRChatBuildPipelinePreprocessor : IPlatformDependantPreprocessor
     {
-        public GameObject PerformEnvironmentDependantShallowCopy(GameObject unmodifiableRoot)
+        public GameObject Preprocess(GameObject modifiableRoot)
         {
 #if RIH_HAS_VRCSDK3A
-            if (!unmodifiableRoot.TryGetComponent<VRCAvatarDescriptor>(out _))
+            if (!modifiableRoot.TryGetComponent<VRCAvatarDescriptor>(out _))
             {
                 throw new Exception("specified object does not have VRChat Avatar Descriptor.");
             }
 
-            var cloned = Object.Instantiate(unmodifiableRoot);
-
-            VRCBuildPipelineCallbacks.OnPreprocessAvatar(cloned);
-            return cloned;
+            VRCBuildPipelineCallbacks.OnPreprocessAvatar(modifiableRoot);
+            return modifiableRoot;
 #else
             throw new ResoniteImportHelper.Transform.Environment.Common.NonEnabledPlatformException();
 #endif