Unity 2023.3.0a14 C# reference source code

Author: Unity Technologies

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -27,17 +27,20 @@ sealed class AudioContainerWindow : EditorWindow
     internal readonly AudioContainerWindowState State = new();
 
     /// <summary>
-    /// Holds the added list elements in the list interaction callbacks
+    /// Holds the added list elements in the list interaction callbacks.
+    /// Only used locally in these methods, but it's a global member to avoid GC.
     /// </summary>
     readonly List<AudioContainerElement> m_AddedElements = new();
 
+    readonly string k_EmptyGuidString = Guid.Empty.ToString("N");
+
     VisualElement m_ContainerRootVisualElement;
     VisualElement m_Day0RootVisualElement;
 
     // Preview section
     Label m_AssetNameLabel;
-    Button m_PlayButton;
-    VisualElement m_PlayButtonImage;
+    Button m_PlayStopButton;
+    VisualElement m_PlayStopButtonImage;
     Button m_SkipButton;
     VisualElement m_SkipButtonImage;
 
@@ -94,7 +97,7 @@ sealed class AudioContainerWindow : EditorWindow
     bool m_IsInitializing;
     bool m_Day0ElementsInitialized;
     bool m_ContainerElementsInitialized;
-    private bool m_ClipFieldProgressBarsAreCleared = true;
+    bool m_ClipFieldProgressBarsAreCleared = true;
 
     /// <summary>
     /// Holds the previous state of the list elements for undo/delete housekeeping
@@ -117,8 +120,6 @@ void OnEnable()
     {
         Instance = this;
 
-        Undo.undoRedoPerformed += OnUndoRedoPerformed;
-
         State.TargetChanged += OnTargetChanged;
         State.TransportStateChanged += OnTransportStateChanged;
         State.EditorPauseStateChanged += EditorPauseStateChanged;
@@ -143,13 +144,14 @@ void OnDisable()
         UnsubscribeFromClipListCallbacksAndEvents();
         UnsubscribeFromAutomaticTriggerCallbacksAndEvents();
 
-        Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+        EditorApplication.update -= OneTimeEditorApplicationUpdate;
 
         State.TargetChanged -= OnTargetChanged;
         State.TransportStateChanged -= OnTransportStateChanged;
         State.EditorPauseStateChanged -= EditorPauseStateChanged;
 
         State.OnDestroy();
+
         m_CachedElements.Clear();
         m_AddedElements.Clear();
     }
@@ -333,8 +335,8 @@ static void InsertUnitFieldForFloatField(VisualElement field, string unit)
     void InitializePreviewElements()
     {
         m_AssetNameLabel = UIToolkitUtilities.GetChildByName<Label>(m_ContainerRootVisualElement, "asset-name-label");
-        m_PlayButton = UIToolkitUtilities.GetChildByName<Button>(m_ContainerRootVisualElement, "play-button");
-        m_PlayButtonImage = UIToolkitUtilities.GetChildByName<VisualElement>(m_ContainerRootVisualElement, "play-button-image");
+        m_PlayStopButton = UIToolkitUtilities.GetChildByName<Button>(m_ContainerRootVisualElement, "play-button");
+        m_PlayStopButtonImage = UIToolkitUtilities.GetChildByName<VisualElement>(m_ContainerRootVisualElement, "play-button-image");
         m_SkipButton = UIToolkitUtilities.GetChildByName<Button>(m_ContainerRootVisualElement, "skip-button");
         m_SkipButtonImage = UIToolkitUtilities.GetChildByName<VisualElement>(m_ContainerRootVisualElement, "skip-button-image");
 
@@ -344,17 +346,17 @@ void InitializePreviewElements()
 
     void SubscribeToPreviewCallbacksAndEvents()
     {
-        m_PlayButton.clicked += OnPlayStopButtonClicked;
+        m_PlayStopButton.clicked += OnPlayStopButtonClicked;
         m_SkipButton.clicked += OnSkipButtonClicked;
     }
 
     void UnsubscribeFromPreviewCallbacksAndEvents()
     {
-        if (m_PlayButton != null)
-            m_PlayButton.clicked -= OnPlayStopButtonClicked;
+        if (m_PlayStopButton != null)
+            m_PlayStopButton.clicked -= OnPlayStopButtonClicked;
 
-        if (m_PlayButton != null)
-            m_PlayButton.clicked -= OnSkipButtonClicked;
+        if (m_SkipButton != null)
+            m_SkipButton.clicked -= OnSkipButtonClicked;
     }
 
     void BindAndTrackPreviewProperties()
@@ -386,15 +388,15 @@ void UpdateTransportButtonStates()
     {
         var editorIsPaused = EditorApplication.isPaused;
 
-        m_PlayButton?.SetEnabled(State.IsReadyToPlay() && !editorIsPaused);
+        m_PlayStopButton?.SetEnabled(State.IsReadyToPlay() && !editorIsPaused);
         m_SkipButton?.SetEnabled(State.IsPlayingOrPaused() && State.AudioContainer.triggerMode == AudioRandomContainerTriggerMode.Automatic && !editorIsPaused);
 
         var image =
             State.IsPlayingOrPaused()
                 ? UIToolkitUtilities.LoadIcon("Stop")
                 : UIToolkitUtilities.LoadIcon("Play");
 
-        m_PlayButtonImage.style.backgroundImage = new StyleBackground(image);
+        m_PlayStopButtonImage.style.backgroundImage = new StyleBackground(image);
     }
 
     void OnTransportStateChanged(object sender, EventArgs e)
@@ -435,7 +437,6 @@ void InitializeVolumeElements()
         volumeRandomizationMaxField.label = "";
         volumeRandomizationMaxField.formatString = "0.#";
         InsertUnitFieldForFloatField(volumeRandomizationMaxField, "dB");
-
     }
 
     void SubscribeToVolumeCallbacksAndEvents()
@@ -794,18 +795,16 @@ void OnListItemsAdded(IEnumerable<int> indices)
 
         m_AddedElements.Clear();
 
-        var undoName = "Add AudioContainerElement";
+        var undoName = $"Add {nameof(AudioRandomContainer)} element";
 
         if (indicesArray.Length > 1)
         {
             undoName = $"{undoName}s";
         }
 
         Undo.SetCurrentGroupName(undoName);
-        SetTitle();
+
         m_AddedElements.Clear();
-        // Force a list rebuild when the list size has changed or it will not render correctly
-        EditorApplication.update += DoDelayedListRebuild;
     }
 
     void OnListItemsRemoved(IEnumerable<int> indices)
@@ -826,27 +825,25 @@ void OnListItemsRemoved(IEnumerable<int> indices)
 
         State.AudioContainer.NotifyObservers(AudioRandomContainer.ChangeEventType.List);
 
-        var undoName = "Remove AudioContainerElement";
+        var undoName = $"Remove {nameof(AudioRandomContainer)} element";
 
         if (indicesArray.Length > 1)
         {
             undoName = $"{undoName}s";
         }
 
         Undo.SetCurrentGroupName(undoName);
-        SetTitle();
-        // Force a list rebuild when the list size has changed or it will not render correctly
-        EditorApplication.update += DoDelayedListRebuild;
     }
 
     void OnItemListIndexChanged(int oldIndex, int newIndex)
     {
+        Undo.SetCurrentGroupName($"Reorder {nameof(AudioRandomContainer)} list");
         State.AudioContainer.NotifyObservers(AudioRandomContainer.ChangeEventType.List);
     }
 
     void OnAudioClipDrag(List<AudioClip> audioClips)
     {
-        var undoName = "Add AudioContainerElement";
+        var undoName = $"Add {nameof(AudioRandomContainer)} element";
 
         if (audioClips.Count > 1)
             undoName = $"{undoName}s";
@@ -875,17 +872,36 @@ void OnAudioClipDrag(List<AudioClip> audioClips)
             Undo.RegisterCreatedObjectUndo(element, "Create AudioContainerElement");
 
         m_AddedElements.Clear();
-
-        SetTitle();
         Undo.SetCurrentGroupName(undoName);
-        // Force a list rebuild when the list size has changed or it will not render correctly
-        EditorApplication.update += DoDelayedListRebuild;
     }
 
     void OnAudioClipListChanged(SerializedProperty property)
     {
-        UpdateTransportButtonStates();
+        // Do manual fixup of orphaned subassets after a possible undo of item removal
+        // because the undo system does not play nice with RegisterCreatedObjectUndo.
+        if (m_CachedElements.Count < State.AudioContainer.elements.Length)
+        {
+            var elements = State.AudioContainer.elements;
+
+            foreach (var elm in elements)
+            {
+                AssetDatabase.TryGetGUIDAndLocalFileIdentifier(elm, out var guid, out var localId);
+
+                // An empty asset GUID means the subasset has lost the reference
+                // to the main asset after an undo of item removal, so re-add it manually.
+                if (guid.Equals(k_EmptyGuidString))
+                    AssetDatabase.AddObjectToAsset(elm, State.AudioContainer);
+            }
+        }
+
+        // Update the cached list of elements
         m_CachedElements = State.AudioContainer.elements.ToList();
+
+        // Force a list rebuild when the list has changed or it will not always render correctly
+        m_ClipsListView.Rebuild();
+
+        UpdateTransportButtonStates();
+        SetTitle();
     }
 
     void UpdateClipFieldProgressBars()
@@ -939,12 +955,6 @@ void ClearClipFieldProgressBars()
         m_ClipFieldProgressBarsAreCleared = true;
     }
 
-    void DoDelayedListRebuild()
-    {
-        m_ClipsListView.Rebuild();
-        EditorApplication.update -= DoDelayedListRebuild;
-    }
-
     #endregion
 
     #region TriggerAndPlaybackMode
@@ -1185,24 +1195,6 @@ void OnCountRandomizationButtonClicked()
 
     #region GlobalEditorCallbackHandlers
 
-    void OnUndoRedoPerformed()
-    {
-        if (m_ContainerRootVisualElement == null
-            || m_ContainerRootVisualElement.style.display == DisplayStyle.None
-            || State.AudioContainer == null)
-            return;
-
-        if (m_CachedElements.Count != State.AudioContainer.elements.Length)
-        {
-            // Force a list rebuild when the list size has increased or it will not render correctly
-            // if (m_CachedElements.Count < State.AudioContainer.elements.Length)
-                m_ClipsListView.Rebuild();
-
-            SetTitle();
-            m_CachedElements = State.AudioContainer.elements.ToList();
-        }
-    }
-
     void OnWillSaveAssets(IEnumerable<string> paths)
     {
         if (State.AudioContainer == null)

Editor/Mono/Audio/AudioContainerWindowState.cs

@@ -132,25 +132,41 @@ internal void UpdateTarget()
         }
 
         if (m_TrackedSource == audioSource && m_AudioContainer == newTarget)
+        {
             return;
+        }
+
+        var targetChanged = newTarget != m_AudioContainer;
+        var trackedSourceChanged = audioSource != m_TrackedSource;
 
         Reset();
 
         m_TrackedSource = audioSource;
         m_AudioContainer = newTarget;
 
         if (m_AudioContainer != null)
+        {
             TargetPath = AssetDatabase.GetAssetPath(m_AudioContainer);
+        }
 
-        TargetChanged?.Invoke(this, EventArgs.Empty);
+        if (targetChanged)
+        {
+            TargetChanged?.Invoke(this, EventArgs.Empty);
+        }
 
-        if (m_TrackedSource == null)
-            return;
+        if (trackedSourceChanged)
+        {
+            m_ResourceTrackerElement.Unbind();
 
-        var trackedSourceSO = new SerializedObject(m_TrackedSource);
-        var trackedSourceResourceProperty = trackedSourceSO.FindProperty("m_Resource");
-        m_ResourceTrackerElement.TrackPropertyValue(trackedSourceResourceProperty, OnResourceChanged);
+            if (m_TrackedSource != null)
+            {
+                var trackedSourceSO = new SerializedObject(m_TrackedSource);
+                var trackedSourceResourceProperty = trackedSourceSO.FindProperty("m_Resource");
+                m_ResourceTrackerElement.TrackPropertyValue(trackedSourceResourceProperty, OnResourceChanged);
+            }
+        }
     }
+
     void OnResourceChanged(SerializedProperty property)
     {
         var container = property.objectReferenceValue as AudioRandomContainer;

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -2,7 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
 using System.Runtime.InteropServices;
 using UnityEngine;
 using UnityEngine.Bindings;
@@ -21,7 +20,7 @@ internal sealed partial class BuildProfile : ScriptableObject
         /// <summary>
         /// Build Target used to fetch module and build profile extension.
         /// </summary>
-        [SerializeField] BuildTarget m_BuildTarget;
+        [SerializeField] BuildTarget m_BuildTarget = BuildTarget.NoTarget;
         public BuildTarget buildTarget
         {
             get => m_BuildTarget;
@@ -57,5 +56,15 @@ public BuildProfilePlatformSettingsBase platformBuildProfile
             get => m_PlatformBuildProfile;
             internal set => m_PlatformBuildProfile = value;
         }
+
+        void OnEnable()
+        {
+            // Check if the platform support module has been installed,
+            // and try to set an uninitialized platform settings.
+            if (platformBuildProfile == null)
+                TryCreatePlatformSettings();
+
+            onBuildProfileEnable?.Invoke(this);
+        }
     }
 }