make behaviour handling code more concise (#327)

llealloo · Dec 15, 2024 · 88a8496 · 88a8496
1 parent da57703
commit 88a8496
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/Packages/com.llealloo.audiolink/Editor/Scripts/AudioLinkEditor.cs b/Packages/com.llealloo.audiolink/Editor/Scripts/AudioLinkEditor.cs
@@ -4,6 +4,9 @@
 #if UDONSHARP
 using UdonSharp;
 using UdonSharpEditor;
+using BehaviourType = UdonSharpBehaviour;
+#else
+using BehaviourType = MonoBehaviour;
 #endif
 
 using UnityEditor;
@@ -84,21 +87,15 @@ public void LinkAll()
 
         public static void LinkAll(AudioLink target)
         {
+            BehaviourType[] allBehaviours = FindObjectsByType<BehaviourType>(
 #if UNITY_6000_0_OR_NEWER
-#if UDONSHARP
-            MonoBehaviour[] allBehaviours = FindObjectsByType<UdonSharpBehaviour>(FindObjectsInactive.Include, FindObjectsSortMode.InstanceID);
-#endif
-            MonoBehaviour[] allBehaviours = FindObjectsByType<MonoBehaviour>(FindObjectsInactive.Include, FindObjectsSortMode.InstanceID);
-#else
-#if UDONSHARP
-            UdonSharpBehaviour[] allBehaviours = FindObjectsOfType<UdonSharpBehaviour>();
-#else
-            MonoBehaviour[] allBehaviours = FindObjectsOfType<MonoBehaviour>();
-#endif
-#endif
+                FindObjectsInactive.Include, FindObjectsSortMode.InstanceID
+#endif            
+            );
+
             // this handles all reasonable cases of referencing audiolink
             // (it doesn't handle referencing it multiple times in one monobehaviour, or referencing it as it's Base type)
-            foreach (var behaviour in allBehaviours)
+            foreach (BehaviourType behaviour in allBehaviours)
             {
                 FieldInfo fieldInfo = behaviour.GetType().GetField("audioLink");
                 // in case the field isn't called "audioLink"