Unity 2023.3.0b5 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs

@@ -708,7 +708,7 @@ private void HandlePlatformSettingUI(string secondaryTextureName)
             ITexturePlatformSettingsView view = isSecondary ? m_SecondaryTexturePlatformSettingsView : m_TexturePlatformSettingsView;
             if (shownTextureFormatPage == -1)
             {
-                if (m_TexturePlatformSettingsController.HandleDefaultSettings(defaultPlatformSettings, m_TexturePlatformSettingsView, m_TexturePlatformSettingTextureHelper))
+                if (m_TexturePlatformSettingsController.HandleDefaultSettings(defaultPlatformSettings, view, m_TexturePlatformSettingTextureHelper))
                 {
                     for (var i = 0; i < defaultPlatformSettings.Count; ++i)
                     {
@@ -746,7 +746,7 @@ private void HandlePlatformSettingUI(string secondaryTextureName)
                 }
 
                 m_TexturePlatformSettingsView.buildPlatformTitle = buildPlatform.title.text;
-                if (m_TexturePlatformSettingsController.HandlePlatformSettings(buildPlatform.defaultTarget, platformSettings, m_TexturePlatformSettingsView, m_TexturePlatformSettingTextureHelper))
+                if (m_TexturePlatformSettingsController.HandlePlatformSettings(buildPlatform.defaultTarget, platformSettings, view, m_TexturePlatformSettingTextureHelper))
                 {
                     for (var i = 0; i < platformSettings.Count; ++i)
                     {

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -34,7 +34,7 @@ public enum NormalizationMode
 
         static CurveEditorWindow s_SharedCurveEditor;
 
-        CurveEditor m_CurveEditor;
+        internal CurveEditor m_CurveEditor;
 
         AnimationCurve m_Curve;
         Color m_Color;

Editor/Mono/Animation/AnimatorController.cs

@@ -81,6 +81,16 @@ internal void RemoveLayers(List<int> layerIndexes)
             AnimatorControllerLayer[] layerVector = this.layers;
             foreach (var layerIndex in layerIndexes)
             {
+                for (var i = 0; i < layerVector.Length; ++i)
+                {
+                    var syncedLayerIndex = layerVector[i].syncedLayerIndex;
+                    if (syncedLayerIndex > layerIndex)
+                    {
+                        // synced layer is after the layer being removed, so it's going to be shifted upon removal
+                        layerVector[i].syncedLayerIndex = syncedLayerIndex - 1;
+                    }
+                }
+
                 RemoveLayerInternal(layerIndex, ref layerVector);
             }
             this.layers = layerVector;

Editor/Mono/AssetsMenuUtility.bindings.cs

@@ -13,11 +13,13 @@ internal enum ScriptTemplate
         Shader_NewSurfaceShader,
         CSharp_NewSceneTemplatePipelineScript,
         CSharp_NewPlayableAsset,
+        CSharp_NewScriptableObjectScript,
         Shader_NewUnlitShader,
         AsmDef_NewAssembly,
         AsmDef_NewEditModeTestAssembly,
         AsmDef_NewTestAssembly,
         AsmRef_NewAssemblyReference,
+        CSharp_NewEmptyScript,
         CSharp_NewTestScript,
         Shader_NewImageEffectShader,
         Shader_NewComputeShader,

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -94,6 +94,8 @@ sealed class AudioContainerWindow : EditorWindow
     Texture2D m_DiceIconOff;
     Texture2D m_DiceIconOn;
 
+    bool m_IsVisible;
+    bool m_IsSubscribedToGUICallbacksAndEvents;
     bool m_IsInitializing;
     bool m_Day0ElementsInitialized;
     bool m_ContainerElementsInitialized;
@@ -120,10 +122,6 @@ void OnEnable()
     {
         Instance = this;
 
-        State.TargetChanged += OnTargetChanged;
-        State.TransportStateChanged += OnTransportStateChanged;
-        State.EditorPauseStateChanged += EditorPauseStateChanged;
-
         m_DiceIconOff = EditorGUIUtility.IconContent("AudioRandomContainer On Icon").image as Texture2D;
         m_DiceIconOn = EditorGUIUtility.IconContent("AudioRandomContainer Icon").image as Texture2D;
 
@@ -137,27 +135,16 @@ void OnEnable()
     void OnDisable()
     {
         Instance = null;
-
-        UnsubscribeFromPreviewCallbacksAndEvents();
-        UnsubscribeFromVolumeCallbacksAndEvents();
-        UnsubscribeFromPitchCallbacksAndEvents();
-        UnsubscribeFromClipListCallbacksAndEvents();
-        UnsubscribeFromAutomaticTriggerCallbacksAndEvents();
-
-        EditorApplication.update -= OneTimeEditorApplicationUpdate;
-
-        State.TargetChanged -= OnTargetChanged;
-        State.TransportStateChanged -= OnTransportStateChanged;
-        State.EditorPauseStateChanged -= EditorPauseStateChanged;
-
         State.OnDestroy();
-
         m_CachedElements.Clear();
         m_AddedElements.Clear();
     }
 
     void Update()
     {
+        if (!m_IsVisible)
+            return;
+
         if (State.IsPlayingOrPaused()) { UpdateClipFieldProgressBars(); }
         else if (!m_ClipFieldProgressBarsAreCleared) { ClearClipFieldProgressBars(); }
 
@@ -175,12 +162,6 @@ void Update()
         }
     }
 
-    void OnBecameInvisible()
-    {
-        State.Stop();
-        ClearClipFieldProgressBars();
-    }
-
     void SetTitle()
     {
         var titleString = "Audio Random Container";
@@ -222,6 +203,9 @@ void CreateGUI()
                 Assert.IsNotNull(m_Day0RootVisualElement);
             }
 
+            if (m_ContainerElementsInitialized)
+                root.Unbind();
+
             if (State.AudioContainer == null)
             {
                 if (!m_Day0ElementsInitialized)
@@ -235,15 +219,16 @@ void CreateGUI()
             }
             else
             {
-                if (m_ContainerElementsInitialized)
-                    root.Unbind();
-                else
+                if (!m_ContainerElementsInitialized)
                 {
-                    InitializeElements();
-                    SubscribeToCallbacksAndEvents();
+                    InitializeContainerElements();
                     m_ContainerElementsInitialized = true;
+                    EditorApplication.update += OneTimeEditorApplicationUpdate;
                 }
 
+                if (!m_IsSubscribedToGUICallbacksAndEvents)
+                    SubscribeToGUICallbacksAndEvents();
+
                 BindAndTrackObjectAndProperties();
 
                 m_Day0RootVisualElement.style.display = DisplayStyle.None;
@@ -257,6 +242,15 @@ void CreateGUI()
         }
     }
 
+    bool IsDisplayingTarget()
+    {
+        return
+            m_Day0RootVisualElement != null
+            && m_Day0RootVisualElement.style.display == DisplayStyle.None
+            && m_ContainerRootVisualElement != null
+            && m_ContainerRootVisualElement.style.display == DisplayStyle.Flex;
+    }
+
     void InitializeDay0Elements()
     {
         var createButtonLabel = UIToolkitUtilities.GetChildByName<Label>(m_Day0RootVisualElement, "CreateButtonLabel");
@@ -265,7 +259,7 @@ void InitializeDay0Elements()
         createButtonLabel.text = "Select an existing Audio Random Container asset in the project browser or create a new one using the button below.";
     }
 
-    void InitializeElements()
+    void InitializeContainerElements()
     {
         InitializePreviewElements();
         InitializeVolumeElements();
@@ -275,6 +269,26 @@ void InitializeElements()
         InitializeAutomaticTriggerElements();
     }
 
+    void SubscribeToGUICallbacksAndEvents()
+    {
+        SubscribeToPreviewCallbacksAndEvents();
+        SubscribeToVolumeCallbacksAndEvents();
+        SubscribeToPitchCallbacksAndEvents();
+        SubscribeToClipListCallbacksAndEvents();
+        SubscribeToAutomaticTriggerCallbacksAndEvents();
+        m_IsSubscribedToGUICallbacksAndEvents = true;
+    }
+
+    void UnsubscribeFromGUICallbacksAndEvents()
+    {
+        UnsubscribeFromPreviewCallbacksAndEvents();
+        UnsubscribeFromVolumeCallbacksAndEvents();
+        UnsubscribeFromPitchCallbacksAndEvents();
+        UnsubscribeFromClipListCallbacksAndEvents();
+        UnsubscribeFromAutomaticTriggerCallbacksAndEvents();
+        m_IsSubscribedToGUICallbacksAndEvents = false;
+    }
+
     void BindAndTrackObjectAndProperties()
     {
         m_ContainerRootVisualElement.TrackSerializedObjectValue(State.SerializedObject, OnSerializedObjectChanged);
@@ -287,23 +301,17 @@ void BindAndTrackObjectAndProperties()
         BindAndTrackAutomaticTriggerProperties();
     }
 
-    void SubscribeToCallbacksAndEvents()
-    {
-        SubscribeToPreviewCallbacksAndEvents();
-        SubscribeToVolumeCallbacksAndEvents();
-        SubscribeToPitchCallbacksAndEvents();
-        SubscribeToClipListCallbacksAndEvents();
-        SubscribeToAutomaticTriggerCallbacksAndEvents();
-        EditorApplication.update += OneTimeEditorApplicationUpdate;
-    }
-
     void OnTargetChanged(object sender, EventArgs e)
     {
         SetTitle();
         CreateGUI();
 
-        if (State.AudioContainer != null)
+        if (State.AudioContainer == null)
+            m_CachedElements.Clear();
+        else
             m_CachedElements = State.AudioContainer.elements.ToList();
+
+        m_AddedElements.Clear();
     }
 
     void OnSerializedObjectChanged(SerializedObject obj)
@@ -1196,15 +1204,49 @@ void OnCountRandomizationButtonClicked()
 
     #region GlobalEditorCallbackHandlers
 
+    void OnBecameVisible()
+    {
+        m_IsVisible = true;
+        State.TargetChanged += OnTargetChanged;
+        State.TransportStateChanged += OnTransportStateChanged;
+        State.EditorPauseStateChanged += EditorPauseStateChanged;
+        State.Resume();
+
+        if (!m_IsSubscribedToGUICallbacksAndEvents
+            && m_ContainerElementsInitialized
+            && IsDisplayingTarget())
+        {
+            SubscribeToGUICallbacksAndEvents();
+        }
+    }
+
+    void OnBecameInvisible()
+    {
+        m_IsVisible = false;
+        State.TargetChanged -= OnTargetChanged;
+        State.TransportStateChanged -= OnTransportStateChanged;
+        State.EditorPauseStateChanged -= EditorPauseStateChanged;
+        State.Suspend();
+
+        if (m_IsSubscribedToGUICallbacksAndEvents
+            && m_ContainerElementsInitialized
+            && IsDisplayingTarget())
+        {
+            UnsubscribeFromGUICallbacksAndEvents();
+        }
+
+        EditorApplication.update -= OneTimeEditorApplicationUpdate;
+        ClearClipFieldProgressBars();
+    }
+
     void OnWillSaveAssets(IEnumerable<string> paths)
     {
+        // If there is no target we are in day 0 state.
         if (State.AudioContainer == null)
             return;
 
-        var currentSelectionPath = AssetDatabase.GetAssetPath(State.AudioContainer);
-
         foreach (var path in paths)
-            if (path == currentSelectionPath)
+            if (path == State.TargetPath)
             {
                 SetTitle();
                 return;
@@ -1213,27 +1255,32 @@ void OnWillSaveAssets(IEnumerable<string> paths)
 
     void OnAssetsImported(IEnumerable<string> paths)
     {
-        if (State.AudioContainer == null) return;
+        // If there is no target we are in day 0 state.
+        if (State.AudioContainer == null)
+            return;
 
         foreach (var path in paths)
-            if (AssetDatabase.GetMainAssetTypeAtPath(path) == typeof(AudioRandomContainer) &&
-                AssetDatabase.GetMainAssetInstanceID(path) == State.AudioContainer.GetInstanceID())
+            if (path == State.TargetPath)
             {
                 State.SerializedObject.Update();
                 OnTargetChanged(this, EventArgs.Empty);
+                return;
             }
     }
 
     void OnAssetsDeleted(IEnumerable<string> paths)
     {
+        // The target reference will already be invalid at this point if it's been deleted.
+        if (State.AudioContainer != null)
+            return;
+
+        // ...but we still have the target path available for the check.
         foreach (var path in paths)
             if (path == State.TargetPath)
             {
                 State.Reset();
-                SetTitle();
-                CreateGUI();
-                m_CachedElements.Clear();
-                break;
+                OnTargetChanged(this, EventArgs.Empty);
+                return;
             }
     }