Unity 2019.2.0a11 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -985,6 +985,12 @@ static void ClutchRipple(ShortcutArguments args)
             ExecuteShortcut(args, animEditor => { animEditor.state.rippleTimeClutch = args.stage == ShortcutStage.Begin; });
         }
 
+        [Shortcut("Animation/Frame All", typeof(AnimationWindow), KeyCode.A)]
+        static void FrameAll(ShortcutArguments args)
+        {
+            ExecuteShortcut(args, animEditor => { animEditor.triggerFraming = true; });
+        }
+
         private void PlayButtonOnGUI()
         {
             EditorGUI.BeginChangeCheck();

Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs

@@ -133,7 +133,7 @@ public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
             {
                 EditorGUI.showMixedValue = !singleFunctionName;
                 string oldFunctionName = singleFunctionName ? firstEvent.functionName : "";
-                string functionName = EditorGUILayout.TextField(EditorGUIUtility.TrTextContent("Function"), oldFunctionName);
+                string functionName = EditorGUILayout.TextField(EditorGUIUtility.TrTextContent("Function"), oldFunctionName).Replace(" ", "");
                 if (functionName != oldFunctionName)
                 {
                     foreach (var evt in data.selectedEvents)

Editor/Mono/Animation/AnimationWindow/AnimationWindowSelectionItem.cs

@@ -219,10 +219,7 @@ public List<AnimationWindowCurve> curves
 
                                 m_CurvesCache.Add(curve);
 
-                                if (curveBinding.type == typeof(Transform) ||
-                                    curveBinding.type == typeof(RectTransform) && (curveBinding.propertyName.StartsWith("m_LocalScale") ||
-                                                                                   curveBinding.propertyName.StartsWith("m_LocalRotation") ||
-                                                                                   curveBinding.propertyName.StartsWith("localEuler")))
+                                if (AnimationWindowUtility.IsActualTransformCurve(curveBinding))
                                 {
                                     transformCurves.Add(curve);
                                 }

Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs

@@ -1281,6 +1281,13 @@ public static bool IsTransformType(Type type)
             return type == typeof(Transform) || type == typeof(RectTransform);
         }
 
+        public static bool IsActualTransformCurve(EditorCurveBinding curveBinding)
+        {
+            return curveBinding.type == typeof(Transform) || curveBinding.type == typeof(RectTransform) && (curveBinding.propertyName.StartsWith("m_LocalScale") ||
+                curveBinding.propertyName.StartsWith("m_LocalRotation") ||
+                curveBinding.propertyName.StartsWith("localEuler"));
+        }
+
         public static bool ForceGrouping(EditorCurveBinding binding)
         {
             if (binding.type == typeof(Transform))

Editor/Mono/Animation/AnimationWindow/ControlPointRenderer.cs

@@ -25,6 +25,7 @@ private class RenderChunk
             public bool isDirty = true;
         }
 
+        private int m_RenderChunkIndex = -1;
         private List<RenderChunk> m_RenderChunks = new List<RenderChunk>();
 
         private Texture2D m_Icon;
@@ -80,6 +81,8 @@ public void Clear()
 
                 renderChunk.isDirty = true;
             }
+
+            m_RenderChunkIndex = 0;
         }
 
         public void Render()
@@ -144,12 +147,24 @@ public void AddPoint(Rect rect, Color color)
 
         private RenderChunk GetRenderChunk()
         {
-            RenderChunk renderChunk;
+            RenderChunk renderChunk = null;
             if (m_RenderChunks.Count > 0)
             {
-                renderChunk = m_RenderChunks.Last();
-                // Dynamically create new render chunks when needed.
-                if ((renderChunk.vertices.Count + 4) > kMaxVertices)
+                while (m_RenderChunkIndex < m_RenderChunks.Count)
+                {
+                    renderChunk = m_RenderChunks[m_RenderChunkIndex];
+                    // Dynamically create new render chunks when needed.
+                    if ((renderChunk.vertices.Count + 4) > kMaxVertices)
+                    {
+                        m_RenderChunkIndex++;
+                        renderChunk = null;
+                        continue;
+                    }
+
+                    break;
+                }
+
+                if (renderChunk == null)
                 {
                     renderChunk = CreateRenderChunk();
                 }
@@ -176,6 +191,7 @@ private RenderChunk CreateRenderChunk()
             renderChunk.indices = new List<int>();
 
             m_RenderChunks.Add(renderChunk);
+            m_RenderChunkIndex = m_RenderChunks.Count - 1;
 
             return renderChunk;
         }

Editor/Mono/Animation/AnimationWindow/CurveEditor.cs

@@ -849,29 +849,17 @@ private void RecalculateSelectionBounds()
             m_SelectionBoundsAreDirty = false;
         }
 
-        // Frame all curves to be visible.
-        public void FrameClip(bool horizontally, bool vertically)
+        public Bounds GetClipBounds()
         {
-            Bounds frameBounds = curveBounds;
-            if (frameBounds.size == Vector3.zero)
-                return;
-
-            if (horizontally)
-                SetShownHRangeInsideMargins(frameBounds.min.x, frameBounds.max.x);
-            if (vertically)
-                SetShownVRangeInsideMargins(frameBounds.min.y, frameBounds.max.y);
+            return curveBounds;
         }
 
-        // Frame selected keys to be visible.
-        public void FrameSelected(bool horizontally, bool vertically)
+        public Bounds GetSelectionBounds()
         {
             if (!hasSelection)
-            {
-                FrameClip(horizontally, vertically);
-                return;
-            }
+                return GetClipBounds();
 
-            Bounds frameBounds = new Bounds();
+            Bounds frameBounds;
 
             // Add neighboring keys in bounds if only a single key is selected.
             if (selectedCurves.Count == 1)
@@ -896,6 +884,26 @@ public void FrameSelected(bool horizontally, bool vertically)
             // Enforce minimum size of bounds
             frameBounds.size = new Vector3(Mathf.Max(frameBounds.size.x, 0.1F), Mathf.Max(frameBounds.size.y, 0.1F), 0);
 
+            return frameBounds;
+        }
+
+        // Frame all curves to be visible.
+        public void FrameClip(bool horizontally, bool vertically)
+        {
+            Frame(GetClipBounds(), horizontally, vertically);
+        }
+
+        // Frame selected keys to be visible.
+        public void FrameSelected(bool horizontally, bool vertically)
+        {
+            Frame(GetSelectionBounds(), horizontally, vertically);
+        }
+
+        public void Frame(Bounds frameBounds, bool horizontally, bool vertically)
+        {
+            if (frameBounds.size == Vector3.zero)
+                return;
+
             if (horizontally)
                 SetShownHRangeInsideMargins(frameBounds.min.x, frameBounds.max.x);
             if (vertically)
@@ -1008,15 +1016,6 @@ public void CurveGUI()
                         DeleteSelectedKeys();
                         evt.Use();
                     }
-
-                    // Frame All.
-                    // Manually handle hotkey unless we decide to add it to default Unity hotkeys like
-                    // we did for FrameSelected.
-                    if (evt.keyCode == KeyCode.A)
-                    {
-                        FrameClip(true, true);
-                        evt.Use();
-                    }
                     break;
 
                 case EventType.ContextClick:
@@ -1373,6 +1372,8 @@ internal void DeleteSelectedKeys()
                 GUI.changed = true;
             }
             SelectNone();
+
+            GUIUtility.hotControl = 0;
         }
 
         private void DeleteKeys(object obj)
@@ -2025,6 +2026,9 @@ CurveSelection AddKeyAtTime(CurveWrapper cw, float time)
             int keyIndex = AnimationUtility.AddInbetweenKey(cw.curve, time);
             if (keyIndex >= 0)
             {
+                CurveUtility.SetKeyModeFromContext(cw.curve, keyIndex);
+                AnimationUtility.UpdateTangentsFromModeSurrounding(cw.curve, keyIndex);
+
                 // Select the key
                 CurveSelection selectedPoint = new CurveSelection(cw.id, keyIndex);
                 cw.selected = CurveWrapper.SelectionMode.Selected;

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -5,6 +5,7 @@
 using System;
 using UnityEngine;
 using UnityEditor;
+using UnityEditor.ShortcutManagement;
 using System.Linq;
 
 using TangentMode = UnityEditor.AnimationUtility.TangentMode;
@@ -286,6 +287,16 @@ public void Show(Action<AnimationCurve> onCurveChanged, CurveEditorSettings sett
             ShowAuxWindow();
         }
 
+        public void FrameSelected()
+        {
+            m_CurveEditor.FrameSelected(true, true);
+        }
+
+        public void FrameClip()
+        {
+            m_CurveEditor.FrameClip(true, true);
+        }
+
         internal class Styles
         {
             public GUIStyle curveEditorBackground = "PopupCurveEditorBackground";
@@ -546,32 +557,6 @@ void ValidateCurveLibraryTypeAndScale()
             }
         }
 
-        // Polynomial curves have limitations on how they have to be authored.
-        // Since we don't enforce the layout, we have a button that enforces the curve layout instead.
-        /*
-        void OptimizePolynomialCurve (Rect rect)
-        {
-            ///@TODO: only show this when editing shuriken curves....
-
-            bool wasEnabled = GUI.enabled;
-
-            bool isValidPolynomialCurve = true;
-            for (int i=0;i<m_CurveEditor.animationCurves.Length;i++)
-                isValidPolynomialCurve &= AnimationUtility.IsValidPolynomialCurve(m_CurveEditor.animationCurves[i].curve);
-
-            GUI.enabled = !isValidPolynomialCurve;
-            if (GUI.Button (rect, "Optimize Polynomial Curve"))
-            {
-                for (int i=0;i<m_CurveEditor.animationCurves.Length;i++)
-                    AnimationUtility.ConstrainToPolynomialCurve(m_CurveEditor.animationCurves[i].curve);
-
-                m_CurveEditor.SelectNone();
-                SendEvent (EventCommandNames.CurveChangedCommand, true);
-            }
-
-            GUI.enabled = wasEnabled;
-        }*/
-
         public void UpdateCurve()
         {
             DoUpdateCurve(false);
@@ -606,5 +591,17 @@ void SendEvent(string eventName, bool exitGUI)
             }
             GUI.changed = true;
         }
+
+        [Shortcut("Curve Editor/Frame All", typeof(CurveEditorWindow), KeyCode.A)]
+        static void FrameClip(ShortcutArguments args)
+        {
+            var curveEditorWindow = (CurveEditorWindow)args.context;
+
+            if (EditorWindow.focusedWindow != curveEditorWindow)
+                return;
+
+            curveEditorWindow.FrameClip();
+            curveEditorWindow.Repaint();
+        }
     }
 }