Merge pull request #657 from anatawa12/split-util-for-vrcsdk

refactor: split utils for components of VRCSDK
anatawa12 · Oct 30, 2023 · fb7b34c · fb7b34c
2 parents 3fbcacb + f69e4e9
commit fb7b34c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/Editor/Utils/Utils.VRCSDK.cs b/Editor/Utils/Utils.VRCSDK.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using UnityEngine;
+using VRC.Dynamics;
+
+namespace Anatawa12.AvatarOptimizer
+{
+    partial class Utils
+    {
+        public static Transform GetTarget(this VRCPhysBoneBase physBoneBase) =>
+            physBoneBase.rootTransform ? physBoneBase.rootTransform : physBoneBase.transform;
+
+        public static IEnumerable<Transform> GetAffectedTransforms(this VRCPhysBoneBase physBoneBase)
+        {
+            var ignores = new HashSet<Transform>(physBoneBase.ignoreTransforms);
+            var queue = new Queue<Transform>();
+            queue.Enqueue(physBoneBase.GetTarget());
+
+            while (queue.Count != 0)
+            {
+                var transform = queue.Dequeue();
+                yield return transform;
+
+                foreach (var child in transform.DirectChildrenEnumerable())
+                    if (!ignores.Contains(child))
+                        queue.Enqueue(child);
+            }
+        }
+    }
+}
diff --git a/Editor/Utils/Utils.VRCSDK.cs.meta b/Editor/Utils/Utils.VRCSDK.cs.meta
diff --git a/Editor/Utils/Utils.cs b/Editor/Utils/Utils.cs
@@ -75,28 +75,6 @@ public static T GetOrAddComponent<T>(this GameObject go) where T : Component
             return component;
         }
 
-#if AAO_VRCSDK3_AVATARS
-        public static Transform GetTarget(this VRC.Dynamics.VRCPhysBoneBase physBoneBase) =>
-            physBoneBase.rootTransform ? physBoneBase.rootTransform : physBoneBase.transform;
-
-        public static IEnumerable<Transform> GetAffectedTransforms(this VRC.Dynamics.VRCPhysBoneBase physBoneBase)
-        {
-            var ignores = new HashSet<Transform>(physBoneBase.ignoreTransforms);
-            var queue = new Queue<Transform>();
-            queue.Enqueue(physBoneBase.GetTarget());
-
-            while (queue.Count != 0)
-            {
-                var transform = queue.Dequeue();
-                yield return transform;
-
-                foreach (var child in transform.DirectChildrenEnumerable())
-                    if (!ignores.Contains(child))
-                        queue.Enqueue(child);
-            }
-        }
-#endif
-
         public static GameObject NewGameObject(string name, Transform parent)
         {
             var rootObject = new GameObject(name);