Preliminary Unity 6 support (#324)

* Preliminary Unity 6 support. * Remove comment.
llealloo · Dec 15, 2024 · da57703 · da57703
1 parent 9658427
commit da57703
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 17 deletions.
diff --git a/Packages/com.llealloo.audiolink/Editor/Scripts/AudioLinkDefineManager.cs b/Packages/com.llealloo.audiolink/Editor/Scripts/AudioLinkDefineManager.cs
@@ -4,6 +4,11 @@
 using UnityEditor;
 using UnityEngine;
 
+#if UNITY_6000_0_OR_NEWER
+using UnityEditor.Build;
+using UnityEditor.Build.Profile;
+#endif
+
 namespace AudioLink.Editor
 {
     [InitializeOnLoad]
@@ -15,33 +20,42 @@ static AudioLinkDefineManager()
             Shader.EnableKeyword("AUDIOLINK_IMPORTED");
         }
 
-        private static void AddDefinesIfMissing(BuildTargetGroup buildTarget, params string[] newDefines)
+        private static void AddDefinesIfMissing(BuildTargetGroup buildGroup, params string[] newDefines)
         {
             bool definesChanged = false;
-            string existingDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTarget);
-            HashSet<string> defineSet = new HashSet<string>();
-
-            if (existingDefines.Length > 0)
-            {
-                defineSet = new HashSet<string>(existingDefines.Split(';'));
-            }
+#if UNITY_6000_0_OR_NEWER
+            var profile = BuildProfile.GetActiveBuildProfile();
+            string[] defines = profile != null
+                ? profile.scriptingDefines
+                : PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(buildGroup)).Split(';');
+#else
+            string[] defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildGroup).Split(';');
+#endif
+            HashSet<string> defineSet = new HashSet<string>(defines);
 
             foreach (string newDefine in newDefines)
-            {
-                if (defineSet.Add(newDefine))
-                {
-                    definesChanged = true;
-                }
-            }
+                definesChanged |= defineSet.Add(newDefine);
 
             if (definesChanged)
             {
+#if UNITY_6000_0_OR_NEWER
+                if (profile != null)
+                {
+                    profile.scriptingDefines = defineSet.ToArray();
+                    Debug.LogFormat("Set Scripting Define Symbols for selected build profile ({0}) to: {1}", profile.name, string.Join(";", defineSet));
+                }
+                else
+                {
+                    PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(buildGroup), defines);
+                    Debug.LogFormat("Set Scripting Define Symbols for selected build group ({0}) to: {1}", buildGroup.ToString(), string.Join(";", defineSet));
+                }
+#else
                 string finalDefineString = string.Join(";", defineSet.ToArray());
-                PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTarget, finalDefineString);
-                Debug.LogFormat("Set Scripting Define Symbols for selected build target ({0}) to: {1}", buildTarget.ToString(), finalDefineString);
+                PlayerSettings.SetScriptingDefineSymbolsForGroup(buildGroup, finalDefineString);
+                Debug.LogFormat("Set Scripting Define Symbols for selected build target ({0}) to: {1}", buildGroup.ToString(), finalDefineString);
+#endif
             }
         }
     }
-
 }
 #endif
diff --git a/Packages/com.llealloo.audiolink/Editor/Scripts/AudioLinkEditor.cs b/Packages/com.llealloo.audiolink/Editor/Scripts/AudioLinkEditor.cs
@@ -84,10 +84,17 @@ public void LinkAll()
 
         public static void LinkAll(AudioLink target)
         {
+#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
             // 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)