LegacySupport

なにもしなければ自動で既存Actionを読み込むし、なにかすれば名前の設定や取捨選択もできる close #46
pandrabox · Sep 28, 2024 · cf1c0fa · cf1c0fa
1 parent 9ff2271
commit cf1c0fa
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 12 deletions.
diff --git a/Editor/ControlPanel.cs b/Editor/ControlPanel.cs
@@ -20,7 +20,6 @@ namespace com.github.pandrabox.emoteprefab.editor
 {
     public class PutControlPanel
     {
-        public const string OBJNAME = "EmotePrefab_ControlPanel";
         /// <summary>
         /// To call from Unity menu
         /// </summary>
@@ -34,7 +33,7 @@ public static void PutControlPanelMain()
                 EditorUtility.DisplayDialog("PutControlPanel", "この機能はHierarchyでControlPanelをアクティブにしたいアバターを選択してから使って下さい","OK");
                 return;
             }
-            var existController = descriptor.transform.Find(OBJNAME);
+            var existController = descriptor.transform.Find(Config.ControlPanelObjName);
             if (existController != null)
             {
                 if (existController.GetComponent<ControlPanel>()== null)
@@ -44,7 +43,7 @@ public static void PutControlPanelMain()
                 Selection.activeGameObject = existController.gameObject;
                 return;
             }
-            var obj = new GameObject(OBJNAME);
+            var obj = new GameObject(Config.ControlPanelObjName);
             obj.transform.SetParent(descriptor.transform);
             obj.AddComponent<ControlPanel>();
             Selection.activeGameObject = obj;

diff --git a/Editor/EmotePrefabInitializer.cs b/Editor/EmotePrefabInitializer.cs
@@ -25,12 +25,13 @@ public class EmotePrefabInitializer
         public EmotePrefabInitializer(VRCAvatarDescriptor descriptor)
         {
             Descriptor = descriptor;
+            GetControlPanel();
+            CreateLegacys();
             GetEmotePrefabs();
             if (!HasTask) return;
             CreateWorkDir();
             CopyControllers();
             CreateRootObject();
-            GetControlPanel();
             CreateActionObject();
             CreateFXObject();
             CreateFXRelativeObject();
@@ -52,6 +53,13 @@ private static void GetEmotePrefabs()
             }
         }
 
+        private static void CreateLegacys()
+        {
+            if(PanelSetting.LegacySupport)
+            {
+                new LegacySupport(Descriptor);
+            }
+        }
         private static void GetControlPanel()
         {
             PanelSetting = Descriptor.transform.GetComponentsInChildren<ControlPanel>(false).Where(e => e.Enable).FirstOrDefault();

diff --git a/Runtime/EmotePrefabBulkGeneration.cs → Runtime/BulkGeneration.cs b/Runtime/EmotePrefabBulkGeneration.cs → Runtime/BulkGeneration.cs
@@ -12,7 +12,7 @@
 using VRC.SDK3.Dynamics.PhysBone.Components;
 using static com.github.pandrabox.emoteprefab.runtime.Generic;
 
-public class EmotePrefabBulkGeneration : EditorWindow
+public class BulkGeneration : EditorWindow
 {
     private DefaultAsset targetFolder;
     private Vector2 scrollPosition;
@@ -21,13 +21,48 @@ public class EmotePrefabBulkGeneration : EditorWindow
     public static void ShowWindow()
     {
         // ウィンドウを表示
-        GetWindow<EmotePrefabBulkGeneration>("EmotePrefabBulkGeneration");
+        GetWindow<BulkGeneration>("BulkGeneration");
     }
+    private void LegacySupporArea()
+    {
 
+        GUIStyle labelStyle = new GUIStyle(GUI.skin.label);
+        var selectObj = Selection.gameObjects.FirstOrDefault();
+        if (selectObj == null)
+        {
+            GUILayout.Label("この機能を使うためには、対象のアバターをHierarchyでクリックして下さい", labelStyle);
+            return;
+        }
+        var descriptor = FindComponentFromParent<VRCAvatarDescriptor>(selectObj);
+        if (descriptor == null)
+        {
+            GUILayout.Label("この機能を使うためには、対象のアバターをHierarchyでクリックして下さい", labelStyle);
+            return;
+        }
+        GUILayout.Label($@"対象アバター：{descriptor.name}");
+        if (descriptor.transform.Find(Config.LegacyObjName) != null)
+        {
+            GUILayout.Label("実行済み", labelStyle);
+            return;
+        }
+        if (GUILayout.Button("実行"))
+        {
+            new LegacySupport(descriptor);
+            var cp = descriptor.transform.Find(Config.ControlPanelObjName).GetComponent<ControlPanel>();
+            cp.LegacySupport = false;
+            EditorUtility.DisplayDialog("一括生成", $@"アバター直下に{Config.LegacyObjName}オブジェクトを生成し、重複防止のためControlPanelのLegacySupportをOFFにしました。", "OK");
+        }
+    }
     // エディタウィンドウの内容を描画
     private void OnGUI()
     {
-        GUILayout.Label("一括生成", EditorStyles.boldLabel);
+        GUILayout.Label("一括生成(既存Actionから)", EditorStyles.boldLabel);
+        LegacySupporArea();
+
+        GUILayout.Box("", GUILayout.ExpandWidth(true), GUILayout.Height(1));
+
+
+        GUILayout.Label("一括生成(フォルダから)", EditorStyles.boldLabel);
         targetFolder = (DefaultAsset)EditorGUILayout.ObjectField("対象フォルダ", targetFolder, typeof(DefaultAsset), false);
 
         if (targetFolder == null) return;

diff --git a/Runtime/EmotePrefabBulkGeneration.cs.meta → Runtime/BulkGeneration.cs.meta b/Runtime/EmotePrefabBulkGeneration.cs.meta → Runtime/BulkGeneration.cs.meta
diff --git a/Runtime/Config.cs b/Runtime/Config.cs
@@ -134,6 +134,9 @@ public static class Config
         /// GemeratedFXレイヤにおけるShrinkPhysBonesレイヤのIndex
         /// </summary>
         public static readonly int ShrinkPhysBonesIndex = 2;
+
+        public static readonly string LegacyObjName = "EmotePrefab_Legacies";
+        public static readonly string ControlPanelObjName = "EmotePrefab_ControlPanel";
     }
 }
 

diff --git a/Runtime/ControlPanel.cs b/Runtime/ControlPanel.cs
@@ -21,6 +21,7 @@ public class ControlPanel : MonoBehaviour, VRC.SDKBase.IEditorOnly
         public int UseSyncBitNum;
         public bool UseHeightControl = true;
         public float HeightUpper=3, HeightLower=-3;
+        public bool LegacySupport = true;
     }
 
 
@@ -71,14 +72,14 @@ void Disable(string msg)
                 {
                     Disable("親オブジェクトにVRCAvatarDescriptorが見つかりませんでした。親のオブジェクトの状態を確認するか、このオブジェクトを削除して「Pan→PutControlPanel」より再導入して下さい。");
                 }
-                var controlPanelsCount = descriptor.transform.Cast<Transform>().Count(c => c.name == "EmotePrefab_ControlPanel" && c.GetComponent<ControlPanel>() != null);
+                var controlPanelsCount = descriptor.transform.Cast<Transform>().Count(c => c.name == Config.ControlPanelObjName && c.GetComponent<ControlPanel>() != null);
                 if (controlPanelsCount > 1)
                 {
                     Disable("ControlPanelが複数見つかりました。1つのアバターに導入できるControlPanelは1つのみです。不要なオブジェクトを削除して下さい。");
                 }
-                if (nowinstance.gameObject.name != "EmotePrefab_ControlPanel")
+                if (nowinstance.gameObject.name != Config.ControlPanelObjName)
                 {
-                    Disable("このコンポーネントは「EmotePrefab_ControlPanel」という名前のオブジェクトにアタッチされているときのみ有効です。オブジェクトの名前を修正するか、削除して「Pan→PutControlPanel」より再導入して下さい。");
+                    Disable($@"このコンポーネントは「{Config.ControlPanelObjName}」という名前のオブジェクトにアタッチされているときのみ有効です。オブジェクトの名前を修正するか、削除して「Pan→PutControlPanel」より再導入して下さい。");
                 }
                 //if (descriptor.transform.chil)
 
@@ -112,10 +113,14 @@ void Disable(string msg)
                 GUILayout.Label("表情レイヤ", TitleStyle());
                 EditorGUILayout.PropertyField(serializedObject.FindProperty("FaxialExpressionLayer"));
 
+
+                GUILayout.Label("既存Actionに登録されている全Animationを登録", TitleStyle());
+                EditorGUILayout.PropertyField(serializedObject.FindProperty("LegacySupport"));
+
                 GUILayout.Label("EmotePrefab一括生成", TitleStyle());
                 if (GUILayout.Button("起動"))
                 {
-                    EmotePrefabBulkGeneration.ShowWindow();
+                    BulkGeneration.ShowWindow();
                 }
 
             }

diff --git a/Runtime/EmoteMenuInfo.cs b/Runtime/EmoteMenuInfo.cs
@@ -27,7 +27,7 @@ public enum AutoFolderModeType
             parallel,
             none
         }
-        public bool Sort;
+        public bool Sort=true;
         public AutoFolderModeType AutoFolderMode;
     }
 }

diff --git a/Runtime/LegacySupport.cs b/Runtime/LegacySupport.cs
@@ -0,0 +1,44 @@
+#if UNITY_EDITOR
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using com.github.pandrabox.emoteprefab.runtime;
+using nadena.dev.ndmf;
+using UnityEditor;
+using UnityEditor.Animations;
+using UnityEngine;
+using VRC.SDK3.Avatars.Components;
+using VRC.SDKBase;
+using static com.github.pandrabox.emoteprefab.runtime.Generic;
+
+
+namespace com.github.pandrabox.emoteprefab.runtime
+{
+    public class LegacySupport
+    {
+        public LegacySupport(VRCAvatarDescriptor descriptor)
+        {
+            AnimationClip[] clips = descriptor.baseAnimationLayers[3].animatorController?.animationClips;
+            if (clips == null) return;
+            HashSet<AnimationClip> uniqueClipsSet = new HashSet<AnimationClip>(clips);
+            AnimationClip[] uniqueClips = new AnimationClip[uniqueClipsSet.Count];
+            uniqueClipsSet.CopyTo(uniqueClips);
+            var root = new GameObject(Config.LegacyObjName);
+            var folder = root.AddComponent<EmoteFolder>();
+            folder.FolderName = "Legacies";
+            root.transform.SetParent(descriptor.transform);
+            foreach(var cl in uniqueClips)
+            {
+                var obj = new GameObject();
+                obj.transform.SetParent(root.transform);
+                var ep = obj.AddComponent<EmotePrefab>();
+                ep.SetEasy(cl);
+            }
+        }
+    }
+}
+
+#endif
+
diff --git a/Runtime/LegacySupport.cs.meta b/Runtime/LegacySupport.cs.meta