Remove always disabled objects

.docs/content/docs/reference/automatic-configuration/index.ja.md

@@ -11,6 +11,8 @@ weight: 1
 現在、以下の機能の自動設定が可能です。
 - [FreezeBlendShape](../freeze-blendshape)
   アニメーションなどで使われていないBlendShapeを自動的に固定・除去します。
+- `使われていないGameObjectを自動的に削除する`
+  使われていない、存在価値のないGameObjectを自動的に削除します
 
 また、以下の設定で自動設定を調節できます。
 - `MMDワールドとの互換性`

.docs/content/docs/reference/automatic-configuration/index.md

@@ -11,6 +11,8 @@ You can enable/disable some automatic configuration features with checkboxes.
 Currently the following features can be configured automatically
 - [FreezeBlendShape](../freeze-blendshape)
   Automatically freezes unused BlendShapes in animation or else.
+- `Remove unused GameObjects`
+  Automatically removes unused (meaningless) GameObjects.
 
 Also, You can adjust automatic configuration with the following settings
 - `MMD World Compatibility`

CHANGELOG-PRERELEASE.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Remove always disabled objects `#278`
 
 ### Changed
 - Use UnityEditor api to compress texture `#276`

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Remove always disabled objects `#278`
 
 ### Changed
 - Use UnityEditor api to compress texture `#276`

Editor/AutomaticConfiguration.cs

@@ -7,11 +7,13 @@ namespace Anatawa12.AvatarOptimizer
     internal class AutomaticConfigurationEditor : AvatarGlobalComponentEditorBase
     {
         private SerializedProperty _freezeBlendShape;
+        private SerializedProperty _removeUnusedObjects;
         private SerializedProperty _mmdWorldCompatibility;
 
         private void OnEnable()
         {
             _freezeBlendShape = serializedObject.FindProperty(nameof(AutomaticConfiguration.freezeBlendShape));
+            _removeUnusedObjects = serializedObject.FindProperty(nameof(AutomaticConfiguration.removeUnusedObjects));
             _mmdWorldCompatibility = serializedObject.FindProperty(nameof(AutomaticConfiguration.mmdWorldCompatibility));
         }
 
@@ -24,6 +26,7 @@ protected override void OnInspectorGUIInner()
             EditorGUILayout.PropertyField(_mmdWorldCompatibility);
             GUILayout.Label("Features", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(_freezeBlendShape);
+            EditorGUILayout.PropertyField(_removeUnusedObjects);
 
             serializedObject.ApplyModifiedProperties();
         }

Editor/Processors/AutomaticConfiguration/AutomaticConfigurationProcessor.CollectUsages.cs

@@ -249,21 +249,20 @@ private void GatherAnimationModificationsInController(GameObject root, RuntimeAn
 
         readonly struct ParsedAnimation
         {
-            public readonly IReadOnlyDictionary<Component, IReadOnlyDictionary<string, AnimationProperty>> Components;
+            public readonly IReadOnlyDictionary<Object, IReadOnlyDictionary<string, AnimationProperty>> Components;
 
-            public ParsedAnimation(IReadOnlyDictionary<Component, IReadOnlyDictionary<string, AnimationProperty>> components)
+            public ParsedAnimation(IReadOnlyDictionary<Object, IReadOnlyDictionary<string, AnimationProperty>> components)
             {
                 Components = components;
             }
 
             public static ParsedAnimation Parse(GameObject root, AnimationClip clip)
             {
-                var components = new Dictionary<Component, IReadOnlyDictionary<string, AnimationProperty>>();
+                var components = new Dictionary<Object, IReadOnlyDictionary<string, AnimationProperty>>();
 
                 foreach (var binding in AnimationUtility.GetCurveBindings(clip))
                 {
-                    if (!typeof(Component).IsAssignableFrom(binding.type)) continue;
-                    var obj = (Component)AnimationUtility.GetAnimatedObject(root, binding);
+                    var obj = AnimationUtility.GetAnimatedObject(root, binding);
                     if (obj == null) continue;
 
                     var curve = AnimationUtility.GetEditorCurve(clip, binding);

Editor/Processors/AutomaticConfiguration/AutomaticConfigurationProcessor.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace Anatawa12.AvatarOptimizer.Processors
 {
@@ -10,8 +11,8 @@ internal partial class AutomaticConfigurationProcessor
         private AutomaticConfiguration _config;
         private OptimizerSession _session;
 
-        private Dictionary<Component, Dictionary<string, AnimationProperty>> _modifiedProperties =
-            new Dictionary<Component, Dictionary<string, AnimationProperty>>();
+        private Dictionary<Object, Dictionary<string, AnimationProperty>> _modifiedProperties =
+            new Dictionary<Object, Dictionary<string, AnimationProperty>>();
 
         public void Process(OptimizerSession session)
         {
@@ -23,13 +24,20 @@ public void Process(OptimizerSession session)
             GatherAnimationModifications();
             if (_config.freezeBlendShape)
                 AutoFreezeBlendShape();
+            if (_config.removeUnusedObjects)
+                FindUnusedObjects();
         }
 
         private IReadOnlyDictionary<string, AnimationProperty> GetModifiedProperties(Component component)
         {
             return _modifiedProperties.TryGetValue(component, out var value) ? value : EmptyProperties;
         }
 
+        private IReadOnlyDictionary<string, AnimationProperty> GetModifiedProperties(GameObject component)
+        {
+            return _modifiedProperties.TryGetValue(component, out var value) ? value : EmptyProperties;
+        }
+
         private static readonly IReadOnlyDictionary<string, AnimationProperty> EmptyProperties =
             new ReadOnlyDictionary<string, AnimationProperty>(new Dictionary<string, AnimationProperty>());
 

Localization/en.po

@@ -306,6 +306,12 @@ msgstr "Configure Freeze Blend Shape"
 msgid "AutomaticConfiguration:prop:mmdWorldCompatibility"
 msgstr "MMD World Compatibility"
 
+msgid "AutomaticConfiguration:prop:removeUnusedObjects"
+msgstr "Remove unused GameObjects"
+
+msgid "AutomaticConfiguration:tooltip:removeUnusedObjects"
+msgstr "Removes GameObjects doesn't have meaning."
+
 msgid "AutomaticConfiguration:tooltip:mmdWorldCompatibility"
 msgstr "Enable MMD World Compatibility features such as keeping some BlendShapes"
 

Localization/ja.po

@@ -240,6 +240,12 @@ msgstr "このコンポーネントをアバターにつけると、アニメー
 msgid "AutomaticConfiguration:prop:freezeBlendShape"
 msgstr "Freeze Blend Shapeを自動設定する"
 
+msgid "AutomaticConfiguration:prop:removeUnusedObjects"
+msgstr "使われていないGameObjectを自動的に削除する"
+
+msgid "AutomaticConfiguration:tooltip:removeUnusedObjects"
+msgstr "存在価値のないGameObjectを自動的に削除します。"
+
 msgid "AutomaticConfiguration:prop:mmdWorldCompatibility"
 msgstr "MMDワールドとの互換性"
 

Runtime/AutomaticConfiguration.cs

@@ -11,6 +11,10 @@ internal class AutomaticConfiguration : AvatarGlobalComponent
         [CL4EELocalized("AutomaticConfiguration:prop:freezeBlendShape")]
         [ToggleLeft]
         public bool freezeBlendShape = true;
+        [CL4EELocalized("AutomaticConfiguration:prop:removeUnusedObjects",
+            "AutomaticConfiguration:tooltip:removeUnusedObjects")]
+        [ToggleLeft]
+        public bool removeUnusedObjects = true;
         [CL4EELocalized("AutomaticConfiguration:prop:mmdWorldCompatibility",
             "AutomaticConfiguration:tooltip:mmdWorldCompatibility")]
         [ToggleLeft]