Unity 2021.1.0a2 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/SpriteAtlasAsset.bindings.cs

@@ -45,5 +45,20 @@ public class SpriteAtlasAsset : UnityEngine.Object
         extern internal bool GetSecondaryColorSpace(string secondaryTextureName);
         extern internal void SetSecondaryColorSpace(string secondaryTextureName, bool srGB);
         extern internal void DeleteSecondaryPlatformSettings(string secondaryTextureName);
+
+        // Load SpriteAtlasAsset
+        public static SpriteAtlasAsset Load(string assetPath)
+        {
+            var objs = UnityEditorInternal.InternalEditorUtility.LoadSerializedFileAndForget(assetPath);
+            return (objs.Length > 0) ? objs[0] as SpriteAtlasAsset : null;
+        }
+
+        public static void Save(SpriteAtlasAsset asset, string assetPath)
+        {
+            if (asset == null)
+                throw new ArgumentNullException("Parameter asset is null");
+            var objs = new UnityEngine.Object[] { asset };
+            UnityEditorInternal.InternalEditorUtility.SaveToSerializedFileAndForget(objs, assetPath, true);
+        }
     }
 };

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

@@ -76,6 +76,7 @@ class Styles
             public readonly int packableElementHash = "PackableElement".GetHashCode();
             public readonly int packableSelectorHash = "PackableSelector".GetHashCode();
 
+            public readonly string swapObjectRegisterUndo = L10n.Tr("Swap Packable");
             public readonly string secondaryTextureNameTextControlName = "secondary_texture_name_text_field";
             public readonly string defaultTextForSecondaryTextureName = L10n.Tr("(Matches the names of the Secondary Textures in your Sprites.)");
             public readonly string nameUniquenessWarning = L10n.Tr("Secondary Texture names must be unique within a Sprite or Sprite Atlas.");
@@ -345,6 +346,7 @@ void DrawPackableElement(Rect rect, int index, bool selected, bool focused)
             {
                 // Always call Remove() on the previous object if we swapping the object field item.
                 // This ensure the Sprites was pack in this atlas will be refreshed of it unbound.
+                Undo.RegisterCompleteObjectUndo(spriteAtlasAsset, styles.swapObjectRegisterUndo);
                 if (previousObject != null)
                     spriteAtlasAsset.Remove(new Object[] { previousObject });
                 property.objectReferenceValue = changedObject;

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

@@ -77,6 +77,7 @@ class Styles
             public readonly int packableElementHash = "PackableElement".GetHashCode();
             public readonly int packableSelectorHash = "PackableSelector".GetHashCode();
 
+            public readonly string swapObjectRegisterUndo = L10n.Tr("Swap Packable");
             public readonly string secondaryTextureNameTextControlName = "secondary_texture_name_text_field";
             public readonly string defaultTextForSecondaryTextureName = L10n.Tr("(Matches the names of the Secondary Textures in your Sprites.)");
             public readonly string nameUniquenessWarning = L10n.Tr("Secondary Texture names must be unique within a Sprite or Sprite Atlas.");
@@ -326,6 +327,7 @@ void DrawPackableElement(Rect rect, int index, bool selected, bool focused)
             {
                 // Always call Remove() on the previous object if we swapping the object field item.
                 // This ensure the Sprites was pack in this atlas will be refreshed of it unbound.
+                Undo.RegisterCompleteObjectUndo(spriteAtlas, styles.swapObjectRegisterUndo);
                 if (previousObject != null)
                     spriteAtlas.Remove(new Object[] { previousObject });
                 property.objectReferenceValue = changedObject;

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -4,12 +4,9 @@
 
 using System;
 using UnityEngine;
-using UnityEditor;
-using System.Collections;
 using System.Collections.Generic;
 using UnityEditor.ShortcutManagement;
 using UnityEditorInternal;
-using Object = UnityEngine.Object;
 
 namespace UnityEditor
 {
@@ -1272,16 +1269,18 @@ public void EndKeyModification()
 
         void HandleMainAreaCopyPaste(int controlID)
         {
-            if (GUIUtility.keyboardControl != controlID)
-                return;
-
             var evt = Event.current;
             var type = evt.GetTypeForControl(controlID);
             if (type != EventType.ValidateCommand && type != EventType.ExecuteCommand)
                 return;
 
             if (evt.commandName == EventCommandNames.Copy)
             {
+                // If events timeline has selected events right now then bail out; copying of
+                // these will get processed later by AnimationEventTimeLine.
+                if (m_Events.HasSelectedEvents)
+                    return;
+
                 if (type == EventType.ExecuteCommand)
                 {
                     if (m_State.showCurveEditor)
@@ -1294,9 +1293,17 @@ void HandleMainAreaCopyPaste(int controlID)
             {
                 if (type == EventType.ExecuteCommand)
                 {
-                    SaveCurveEditorKeySelection();
-                    m_State.PasteKeys();
-                    UpdateSelectedKeysToCurveEditor();
+                    // If clipboard contains events right now then paste those.
+                    if (AnimationWindowEventsClipboard.CanPaste())
+                    {
+                        m_Events.PasteEvents(m_State.activeRootGameObject, m_State.activeAnimationClip, m_State.currentTime);
+                    }
+                    else
+                    {
+                        SaveCurveEditorKeySelection();
+                        m_State.PasteKeys();
+                        UpdateSelectedKeysToCurveEditor();
+                    }
 
                     // data is scheduled for an update, bail out now to avoid using out of date data.
                     EditorGUIUtility.ExitGUI();

Editor/Mono/Animation/AnimationWindow/AnimationWindowClipboard.cs

@@ -77,6 +77,12 @@ internal static void CopyEvents(IList<AnimationEvent> allEvents, bool[] selected
                 copyEvents.Add(new AnimationWindowEventClipboard(allEvents[explicitIndex]));
             }
             var data = new AnimationWindowEventsClipboard {events = copyEvents.ToArray()};
+
+            // Animation keyframes right now do not go through regular clipboard machinery,
+            // so when copying Events, make sure Keyframes are cleared from the clipboard, or things
+            // get confusing.
+            AnimationWindowState.ClearKeyframeClipboard();
+
             Clipboard.SetCustomValue(data);
         }
 

Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs

@@ -3,15 +3,12 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Reflection;
 using System.Linq;
 using UnityEngine;
 using UnityEditor;
 using System.Collections.Generic;
-using System.Collections;
 using UnityEditor.IMGUI.Controls;
 using Object = UnityEngine.Object;
-using Random = UnityEngine.Random;
 
 namespace UnityEditorInternal
 {
@@ -1163,6 +1160,16 @@ public void TransformRippleKeys(Matrix4x4 matrix, float t1, float t2, bool flipX
                 EndLiveEdit();
         }
 
+        internal static bool CanPasteKeys()
+        {
+            return s_KeyframeClipboard != null && s_KeyframeClipboard.Count > 0;
+        }
+
+        internal static void ClearKeyframeClipboard()
+        {
+            s_KeyframeClipboard?.Clear();
+        }
+
         public void CopyKeys()
         {
             if (s_KeyframeClipboard == null)
@@ -1187,6 +1194,12 @@ public void CopyKeys()
             {
                 CopyAllActiveCurves();
             }
+
+            // Animation keyframes right now do not go through regular clipboard machinery,
+            // so when copying keyframes, make sure regular clipboard is cleared, or things
+            // get confusing.
+            if (s_KeyframeClipboard.Count > 0)
+                Clipboard.stringValue = string.Empty;
         }
 
         public void CopyAllActiveCurves()

Editor/Mono/Animation/AnimationWindow/Deprecated/AnimationEventTimeline.cs

@@ -31,9 +31,9 @@ internal static class Styles
 
         private bool m_DirtyTooltip = false;
         private int m_HoverEvent = -1;
-        // Rects used for checking mouse-move state changes
         private string m_InstantTooltipText = null;
         private Vector2 m_InstantTooltipPoint = Vector2.zero;
+        private bool m_HasSelectedEvents;
 
         public AnimationEventTimeLine(EditorWindow owner)
         {
@@ -72,6 +72,8 @@ public EventLineContextMenuObject(GameObject animated, AnimationClip clip, float
             }
         }
 
+        internal bool HasSelectedEvents => m_HasSelectedEvents;
+
         public void AddEvent(float time, GameObject gameObject, AnimationClip animationClip)
         {
             AnimationWindowEvent awEvent = AnimationWindowEvent.CreateAndEdit(gameObject, animationClip, time);
@@ -142,7 +144,7 @@ void CopyEvents(AnimationClip clip, bool[] selected, int explicitIndex = -1)
             AnimationWindowEventsClipboard.CopyEvents(allEvents, selected, explicitIndex);
         }
 
-        void PasteEvents(GameObject animated, AnimationClip clip, float time)
+        internal void PasteEvents(GameObject animated, AnimationClip clip, float time)
         {
             var oldEvents = AnimationUtility.GetAnimationEvents(clip);
             var newEvents = AnimationWindowEventsClipboard.AddPastedEvents(oldEvents, time, out var selected);
@@ -226,6 +228,7 @@ public void EventLineGUI(Rect rect, AnimationWindowState state)
                 }
 
                 bool[] selectedEvents = new bool[events.Length];
+                m_HasSelectedEvents = false;
 
                 Object[] selectedObjects = Selection.objects;
                 foreach (Object selectedObject in selectedObjects)
@@ -236,6 +239,7 @@ public void EventLineGUI(Rect rect, AnimationWindowState state)
                         if (awe.eventIndex >= 0 && awe.eventIndex < selectedEvents.Length)
                         {
                             selectedEvents[awe.eventIndex] = true;
+                            m_HasSelectedEvents = true;
                         }
                     }
                 }

Editor/Mono/Animation/ZoomableArea.cs

@@ -85,9 +85,25 @@ private void SetAllowExceed(ref float rangeEnd, ref bool allowExceed, float valu
         private float m_VScaleMin = kMinScale;
         private float m_VScaleMax = kMaxScale;
 
-        private const float kMinWidth = 0.05f;
+        private float m_MinWidth = 0.05f;
         private const float kMinHeight = 0.05f;
 
+        public float minWidth
+        {
+            get { return m_MinWidth; }
+            set
+            {
+                if (value > 0)
+                    m_MinWidth = value;
+                else
+                {
+                    Debug.LogWarning("Zoomable area width cannot have a value of " +
+                        "or below 0. Reverting back to a default value of 0.05f");
+                    m_MinWidth = 0.05f;
+                }
+            }
+        }
+
         public float hScaleMin
         {
             get { return m_HScaleMin; }
@@ -352,10 +368,10 @@ public Rect rect
         public void SetShownHRangeInsideMargins(float min, float max)
         {
             float widthInsideMargins = drawRect.width - leftmargin - rightmargin;
-            if (widthInsideMargins < kMinWidth) widthInsideMargins = kMinWidth;
+            if (widthInsideMargins < m_MinWidth) widthInsideMargins = m_MinWidth;
 
             float denum = max - min;
-            if (denum < kMinWidth) denum = kMinWidth;
+            if (denum < m_MinWidth) denum = m_MinWidth;
 
             m_Scale.x = widthInsideMargins / denum;
 
@@ -366,7 +382,7 @@ public void SetShownHRangeInsideMargins(float min, float max)
         public void SetShownHRange(float min, float max)
         {
             float denum = max - min;
-            if (denum < kMinWidth) denum = kMinWidth;
+            if (denum < m_MinWidth) denum = m_MinWidth;
 
             m_Scale.x = drawRect.width / denum;
 
@@ -418,7 +434,7 @@ public Rect shownArea
         {
             set
             {
-                float width = (value.width < kMinWidth) ? kMinWidth : value.width;
+                float width = (value.width < m_MinWidth) ? m_MinWidth : value.width;
                 float height = (value.height < kMinHeight) ? kMinHeight : value.height;
 
                 if (m_UpDirection == YDirection.Positive)
@@ -477,11 +493,11 @@ private Rect shownAreaInsideMarginsInternal
         {
             set
             {
-                float width = (value.width < kMinWidth) ? kMinWidth : value.width;
+                float width = (value.width < m_MinWidth) ? m_MinWidth : value.width;
                 float height = (value.height < kMinHeight) ? kMinHeight : value.height;
 
                 float widthInsideMargins = drawRect.width - leftmargin - rightmargin;
-                if (widthInsideMargins < kMinWidth) widthInsideMargins = kMinWidth;
+                if (widthInsideMargins < m_MinWidth) widthInsideMargins = m_MinWidth;
 
                 float heightInsideMargins = drawRect.height - topmargin - bottommargin;
                 if (heightInsideMargins < kMinHeight) heightInsideMargins = kMinHeight;
@@ -519,9 +535,9 @@ private Rect shownAreaInsideMarginsInternal
 
         float GetWidthInsideMargins(float widthWithMargins, bool substractSliderWidth = false)
         {
-            float width = (widthWithMargins < kMinWidth) ? kMinWidth : widthWithMargins;
+            float width = (widthWithMargins < m_MinWidth) ? m_MinWidth : widthWithMargins;
             float widthInsideMargins = width - leftmargin - rightmargin - (substractSliderWidth ? (m_VSlider ? styles.visualSliderWidth : 0) : 0);
-            return Mathf.Max(widthInsideMargins, kMinWidth);
+            return Mathf.Max(widthInsideMargins, m_MinWidth);
         }
 
         float GetHeightInsideMargins(float heightWithMargins, bool substractSliderHeight = false)
@@ -867,7 +883,7 @@ private void HandleZoomEvent(Vector2 zoomAround, bool scrollwhell)
 
             // Cap scale when at min width to not "glide" away when zooming closer
             float width = shownAreaInsideMargins.width;
-            if (width / scale <= kMinWidth)
+            if (width / scale <= m_MinWidth)
                 return;
 
             SetScaleFocused(zoomAround, scale * m_Scale, Event.current.shift, EditorGUI.actionKey);
@@ -947,7 +963,7 @@ public void EnforceScaleAndRange()
                     {
                         // range only has an influence if it is enforced, i.e. not infinity
                         float denum = hRangeMax - hRangeMin;
-                        if (denum < kMinWidth) denum = kMinWidth;
+                        if (denum < m_MinWidth) denum = m_MinWidth;
 
                         constrainedWidth = Mathf.Min(constrainedWidth, denum);
                     }

Editor/Mono/Annotation/AnnotationUtility.bindings.cs

@@ -69,5 +69,10 @@ internal sealed partial class AnnotationUtility
 
         [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
         internal extern static float iconSize { get; set; }
+
+        [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
+        internal extern static float fadeGizmoSize { get; set; }
+        [StaticAccessor("GetAnnotationManager()", StaticAccessorType.Dot)]
+        internal extern static bool fadeGizmos { get; set; }
     }
 }