Merge pull request #504 from anatawa12/follow-up-ndmf

Remove Legacy ApplyOnPlay

CHANGELOG-PRERELEASE.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog].
 ### Deprecated
 
 ### Removed
+- internal ApplyOnPlay framework `#504`
 
 ### Fixed
 

CHANGELOG.md

@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog].
   - You can migrate to `Remove Unused Objects` only with one click!
 
 ### Removed
+- internal ApplyOnPlay framework `#504`
 
 ### Fixed
 - Crash with Unity 2022 `#423`

Editor/OptimizerSession.cs

@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Anatawa12.AvatarOptimizer.Processors;
-#if NADEMOFU
 using Anatawa12.AvatarOptimizer.ndmf;
 using nadena.dev.ndmf;
-#endif
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -21,12 +19,10 @@ internal class OptimizerSession
         public ObjectMappingBuilder MappingBuilder { get; }
         public MeshInfo2Holder MeshInfo2Holder { get; private set; } = new MeshInfo2Holder();
 
-        #if NADEMOFU
         public static implicit operator OptimizerSession(BuildContext context)
         {
             return context.Extension<OptimizerContext>().session;
         }
-        #endif
 
         public OptimizerSession(GameObject rootObject, bool addToAsset, bool isTest) :
             this(rootObject, addToAsset ? Utils.CreateAssetFile() : null, isTest)

Editor/Processors/OptimizerPlugin.cs

@@ -1,5 +1,4 @@
-#if NADEMOFU
-using System;
+using System;
 using Anatawa12.AvatarOptimizer.ErrorReporting;
 using Anatawa12.AvatarOptimizer.ndmf;
 using Anatawa12.AvatarOptimizer.Processors;
@@ -86,4 +85,3 @@ protected override void OnUnhandledException(Exception e)
         }
     }
 }
-#endif

Editor/Utils.cs

@@ -4,10 +4,6 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
-#if !NADEMOFU
-using Anatawa12.ApplyOnPlay;
-#endif
 using JetBrains.Annotations;
 using UnityEditor;
 using UnityEngine;
@@ -342,21 +338,6 @@ public static void DeleteTemporalDirectory()
             FileUtil.DeleteFileOrDirectory(TemporalDirPath);
         }
 
-#if !NADEMOFU
-        [CanBeNull]
-        public static DummyObject CreateOutputAssetFile(GameObject avatarGameObject, ApplyReason reason)
-        {
-            switch (reason)
-            {
-                case ApplyReason.EnteringPlayMode:
-                    return ApplyOnPlayConfig.Generate ? CreateAssetFile() : null;
-                case ApplyReason.ManualBake:
-                default:
-                    return CreateOutputAssetFile(avatarGameObject);
-            }
-        }
-#endif
-
         public static DummyObject CreateAssetFile()
         {
             var obj = ScriptableObject.CreateInstance<DummyObject>();

Editor/com.anatawa12.avatar-optimizer.editor.asmdef

@@ -32,12 +32,6 @@
     ],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "nadena.dev.ndmf",
-            "expression": "0.4.0",
-            "define": "NADEMOFU"
-        }
-    ],
+    "versionDefines": [],
     "noEngineReferences": false
 }