Unity 2020.1.0a3 C# reference source code

hehe605715432 · Sep 5, 2019 · 02d565c · 02d565c
1 parent 0cf7cda
commit 02d565c
Show file tree

Hide file tree

Showing 532 changed files with 10,153 additions and 6,549 deletions.
diff --git a/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs b/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs
@@ -54,7 +54,7 @@ public override void FetchData()
         private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, GameObject rootGameObject, AnimationClip animationClip, TreeViewItem parent)
         {
             string path = AnimationUtility.CalculateTransformPath(gameObject.transform, rootGameObject.transform);
-            TreeViewItem node = new AddCurvesPopupGameObjectNode(gameObject, parent, gameObject.name);
+            AddCurvesPopupGameObjectNode node = new AddCurvesPopupGameObjectNode(gameObject, parent, gameObject.name);
             List<TreeViewItem> childNodes = new List<TreeViewItem>();
 
             if (m_RootItem == null)
@@ -111,6 +111,20 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, GameObject
                 }
             }
 
+            var animator = rootGameObject.GetComponent<Animator>();
+            if (animator != null)
+            {
+                //If the Animator has a human avatar, we need to check if the avatar's hierarchy matches that of the current GameObject. If they do not match, disable the node.
+                if (animator.avatarRoot != null && animator.isHuman)
+                {
+                    if (animator.avatarRoot.Find(path) == null)
+                    {
+                        node.propertyPathMismatchWithHumanAvatar = true;
+                    }
+                }
+            }
+
+
             if (showEntireHierarchy)
             {
                 // Iterate over all child GOs
@@ -220,6 +234,7 @@ public void UpdateData()
 
     internal class AddCurvesPopupGameObjectNode : TreeViewItem
     {
+        internal bool propertyPathMismatchWithHumanAvatar = false;
         public AddCurvesPopupGameObjectNode(GameObject gameObject, TreeViewItem parent, string displayName)
             : base(gameObject.GetInstanceID(), parent != null ? parent.depth + 1 : -1, parent, displayName)
         {

diff --git a/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs b/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs
@@ -6,6 +6,7 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 using System.Collections.Generic;
+using UnityEditor.ShortcutManagement;
 
 namespace UnityEditorInternal
 {
@@ -18,17 +19,38 @@ internal class AddCurvesPopupHierarchyGUI : TreeViewGUI
         private GUIContent addPropertiesContent = EditorGUIUtility.TrTextContent("Add Properties");
         private const float plusButtonWidth = 17;
 
+        static Texture2D warningIcon = (Texture2D)EditorGUIUtility.LoadRequired("Icons/ShortcutManager/alertDialog.png");
+        public static GUIStyle warningIconStyle;
+
         public AddCurvesPopupHierarchyGUI(TreeViewController treeView, EditorWindow owner)
             : base(treeView, true)
         {
             this.owner = owner;
+            warningIconStyle = new GUIStyle();
+            warningIconStyle.margin = new RectOffset(15, 15, 15, 15);
         }
 
         public override void OnRowGUI(Rect rowRect, TreeViewItem node, int row, bool selected, bool focused)
         {
-            base.OnRowGUI(rowRect, node, row, selected, focused);
-            DoAddCurveButton(rowRect, node);
-            HandleContextMenu(rowRect, node);
+            bool propertyPathMismatchWithHumanAvatar = false;
+            AddCurvesPopupGameObjectNode addCurvesPopupNode = node as AddCurvesPopupGameObjectNode;
+            if (addCurvesPopupNode != null)
+            {
+                propertyPathMismatchWithHumanAvatar = addCurvesPopupNode.propertyPathMismatchWithHumanAvatar;
+            }
+
+            using (new EditorGUI.DisabledScope(propertyPathMismatchWithHumanAvatar))
+            {
+                base.OnRowGUI(rowRect, node, row, selected, focused);
+                DoAddCurveButton(rowRect, node);
+                HandleContextMenu(rowRect, node);
+            }
+
+            if (propertyPathMismatchWithHumanAvatar)
+            {
+                Rect iconRect = new Rect(rowRect.width - plusButtonWidth, rowRect.yMin, plusButtonWidth, plusButtonStyle.fixedHeight);
+                GUI.Label(iconRect, new GUIContent(warningIcon, "The Avatar definition does not match the property path. Please author using a hierarchy the Avatar was built with."), warningIconStyle);
+            }
         }
 
         private void DoAddCurveButton(Rect rowRect, TreeViewItem node)

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimEditor.cs b/Editor/Mono/Animation/AnimationWindow/AnimEditor.cs
@@ -115,7 +115,7 @@ public FrameRateMenuEntry(GUIContent content, float value)
 
             public GUIContent content;
             public float value;
-        };
+        }
 
         internal static FrameRateMenuEntry[] kAvailableFrameRates = new FrameRateMenuEntry[]
         {

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs b/Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs
@@ -31,7 +31,6 @@ static bool HasAnyRecordableModifications(GameObject root, UndoPropertyModificat
 
         static private UndoPropertyModification[] FilterModifications(IAnimationRecordingState state, ref UndoPropertyModification[] modifications)
         {
-            AnimationClip clip = state.activeAnimationClip;
             GameObject rootGameObject = state.activeRootGameObject;
 
             List<UndoPropertyModification> discardedModifications = new List<UndoPropertyModification>();
@@ -163,7 +162,6 @@ static private void DiscardRotationModification(RotationModification rotationMod
 
         static private UndoPropertyModification[] FilterRotationModifications(IAnimationRecordingState state, ref Dictionary<object, RotationModification> rotationModifications)
         {
-            AnimationClip clip = state.activeAnimationClip;
             GameObject rootGameObject = state.activeRootGameObject;
 
             List<object> itemsToRemove = new List<object>();
@@ -213,9 +211,6 @@ static private void AddRotationPropertyModification(IAnimationRecordingState sta
 
         static private void ProcessRotationModifications(IAnimationRecordingState state, ref Dictionary<object, RotationModification> rotationModifications)
         {
-            AnimationClip clip = state.activeAnimationClip;
-            GameObject root = state.activeRootGameObject;
-
             foreach (KeyValuePair<object, RotationModification> item in rotationModifications)
             {
                 RotationModification m = item.Value;
@@ -387,9 +382,6 @@ static private void ProcessVector3Modification(IAnimationRecordingState state, E
 
         static public void ProcessVector3Modifications(IAnimationRecordingState state, ref Dictionary<object, Vector3Modification> vector3Modifications)
         {
-            AnimationClip clip = state.activeAnimationClip;
-            GameObject root = state.activeRootGameObject;
-
             foreach (KeyValuePair<object, Vector3Modification> item in vector3Modifications)
             {
                 Vector3Modification m = item.Value;
@@ -411,7 +403,6 @@ static public void ProcessVector3Modifications(IAnimationRecordingState state, r
 
         static public void ProcessModifications(IAnimationRecordingState state, UndoPropertyModification[] modifications)
         {
-            AnimationClip clip = state.activeAnimationClip;
             GameObject root = state.activeRootGameObject;
 
             // Record modified properties
@@ -500,7 +491,6 @@ static bool ValueFromPropertyModification(PropertyModification modification, Edi
 
         static void AddKey(IAnimationRecordingState state, EditorCurveBinding binding, Type type, object previousValue, object currentValue)
         {
-            GameObject root = state.activeRootGameObject;
             AnimationClip clip = state.activeAnimationClip;
 
             if ((clip.hideFlags & HideFlags.NotEditable) != 0)
@@ -573,7 +563,6 @@ internal class RootMotionModification
         static private void ProcessRootMotionModifications(IAnimationRecordingState state,
             ref Dictionary<object, RootMotionModification> rootMotionModifications)
         {
-            AnimationClip clip = state.activeAnimationClip;
             GameObject root = state.activeRootGameObject;
             Animator animator = root.GetComponent<Animator>();
 

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
@@ -58,7 +58,7 @@ enum RecordingStateMode
         {
             ManualKey,
             AutoKey
-        };
+        }
 
         class RecordingState : IAnimationRecordingState
         {
@@ -105,7 +105,7 @@ enum ResampleFlags
             FlushUndos          = 1 << 2,
 
             Default             = RefreshViews | FlushUndos
-        };
+        }
 
         private static bool HasFlag(ResampleFlags flags, ResampleFlags flag)
         {

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs
@@ -379,10 +379,7 @@ private static int EnumPopup(string label, Type enumType, int selected)
 
         private static bool IsSupportedMethodName(string name)
         {
-            if (name == "Main" || name == "Start" || name == "Awake" || name == "Update")
-                return false;
-
-            return true;
+            return name != "Main" && name != "Start" && name != "Awake" && name != "Update";
         }
 
         private static string FormatEventArguments(IEnumerable<Type> paramTypes, AnimationEvent evt)

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs
@@ -67,10 +67,7 @@ public override bool IsRenamingItemAllowed(TreeViewItem item)
             if (item is AnimationWindowHierarchyAddButtonNode || item is AnimationWindowHierarchyMasterNode || item is AnimationWindowHierarchyClipNode)
                 return false;
 
-            if ((item as AnimationWindowHierarchyNode).path.Length == 0)
-                return false;
-
-            return true;
+            return (item as AnimationWindowHierarchyNode).path.Length != 0;
         }
 
         public List<AnimationWindowHierarchyNode> CreateTreeFromCurves()

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
@@ -822,14 +822,6 @@ override public bool BeginRename(TreeViewItem item, float delay)
         {
             m_RenamedNode = item as AnimationWindowHierarchyNode;
 
-            GameObject rootGameObject = null;
-            if (m_RenamedNode.curves.Length > 0)
-            {
-                AnimationWindowSelectionItem selectionBinding = m_RenamedNode.curves[0].selectionBinding;
-                if (selectionBinding != null)
-                    rootGameObject = selectionBinding.rootGameObject;
-            }
-
             return GetRenameOverlay().BeginRename(m_RenamedNode.path, item.id, delay);
         }
 

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowManipulator.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowManipulator.cs
@@ -124,7 +124,7 @@ public enum Alignment
             Center,
             Left,
             Right
-        };
+        }
 
         public Alignment alignment;
         public Color headColor;

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
@@ -23,14 +23,14 @@ public enum RefreshType
             None = 0,
             CurvesOnly = 1,
             Everything = 2
-        };
+        }
 
         public enum SnapMode
         {
             Disabled = 0,
             SnapToFrame = 1,
             SnapToClipFrame = 2
-        };
+        }
 
         [SerializeField] public AnimationWindowHierarchyState hierarchyState; // Persistent state of treeview on the left side of window
         [SerializeField] public AnimEditor animEditor; // Reference to owner of this state. Used to trigger repaints.
@@ -1204,7 +1204,7 @@ public void PasteKeys()
                     clipboardCurves.Add(keyframe.curve);
 
             // If we have equal number of target and source curves, then match by index. If not, then try to match with AnimationWindowUtility.BestMatchForPaste.
-            bool matchCurveByIndex = clipboardCurves.Count() == activeCurves.Count();
+            bool matchCurveByIndex = clipboardCurves.Count == activeCurves.Count;
             int targetIndex = 0;
 
             foreach (AnimationWindowKeyframe keyframe in s_KeyframeClipboard)
@@ -1737,7 +1737,7 @@ public Vector2 timeRange
 
         public string FormatFrame(int frame, int frameDigits)
         {
-            return (frame / (int)frameRate).ToString() + ":" + (frame % frameRate).ToString().PadLeft(frameDigits, '0');
+            return (frame / (int)frameRate) + ":" + (frame % frameRate).ToString().PadLeft(frameDigits, '0');
         }
 
         //@TODO: Remove. Replace with animationkeytime

diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
@@ -13,7 +13,6 @@
 using Object = UnityEngine.Object;
 
 using TangentMode = UnityEditor.AnimationUtility.TangentMode;
-using CurveModifiedType = UnityEditor.AnimationUtility.CurveModifiedType;
 
 namespace UnityEditorInternal
 {
@@ -849,7 +848,7 @@ public static float GetNextKeyframeTime(AnimationWindowCurve[] curves, float cur
 
         public static float GetPreviousKeyframeTime(AnimationWindowCurve[] curves, float currentTime, float frameRate)
         {
-            float candidate = float.MinValue;
+            AnimationKeyTime candidateKeyTime = AnimationKeyTime.Time(float.MinValue, frameRate);
             AnimationKeyTime time = AnimationKeyTime.Time(currentTime, frameRate);
             AnimationKeyTime previousTime = AnimationKeyTime.Frame(time.frame - 1, frameRate);
 
@@ -859,14 +858,19 @@ public static float GetPreviousKeyframeTime(AnimationWindowCurve[] curves, float
             {
                 foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
                 {
-                    if (keyframe.time > candidate && keyframe.time <= previousTime.time)
+                    AnimationKeyTime keyTime = AnimationKeyTime.Time(keyframe.time, frameRate);
+                    if (keyTime.frame >= candidateKeyTime.frame && keyTime.frame <= previousTime.frame)
                     {
-                        candidate = keyframe.time;
-                        found = true;
+                        if (keyTime.time >= candidateKeyTime.time)
+                        {
+                            candidateKeyTime = keyTime;
+                            found = true;
+                        }
                     }
                 }
             }
-            return found ? candidate : time.time;
+
+            return found ? candidateKeyTime.time : time.time;
         }
 
         // Add animator, controller and clip to gameobject if they are missing to make this gameobject animatable
@@ -1045,7 +1049,7 @@ internal static AnimationClip AllocateAndSetupClip(bool useAnimator)
 
         public static int GetPropertyNodeID(int setId, string path, System.Type type, string propertyName)
         {
-            return (setId.ToString() + path + type.Name + propertyName).GetHashCode();
+            return (setId + path + type.Name + propertyName).GetHashCode();
         }
 
         // What is the first animation player component (Animator or Animation) when recursing parent tree toward root

diff --git a/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs b/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs
@@ -3861,7 +3861,7 @@ private void SetAxisUiScalars(Vector2 newScalars, List<CurveWrapper> curvesInSam
             }
         }
 
-        internal enum PickMode { None, Click, Marquee };
+        internal enum PickMode { None, Click, Marquee }
 
         public void GridGUI()
         {

diff --git a/Editor/Mono/Animation/AnimationWindow/Deprecated/AnimationEventTimeline.cs b/Editor/Mono/Animation/AnimationWindow/Deprecated/AnimationEventTimeline.cs
@@ -353,7 +353,7 @@ public void EventLineGUI(Rect rect, AnimationWindowState state)
 
         public void DrawInstantTooltip(Rect position)
         {
-            if (m_InstantTooltipText != null && m_InstantTooltipText != "")
+            if (!string.IsNullOrEmpty(m_InstantTooltipText))
             {
                 // Draw body of tooltip
                 GUIStyle style = (GUIStyle)"AnimationEventTooltip";

diff --git a/Editor/Mono/Animation/AnimationWindow/Deprecated/EditorGUIExt.cs b/Editor/Mono/Animation/AnimationWindow/Deprecated/EditorGUIExt.cs
@@ -47,8 +47,7 @@ static bool DoRepeatButton(Rect position, GUIContent content, GUIStyle style, Fo
                     }
                     return false;
                 case EventType.Repaint:
-                    style.Draw(position, content, id);
-                    //          Handles.Repaint ();
+                    style.Draw(position, content, id, false, position.Contains(Event.current.mousePosition));
                     return id == GUIUtility.hotControl && position.Contains(Event.current.mousePosition);
             }
             return false;
@@ -133,17 +132,13 @@ public static void MinMaxScroller(Rect position, int id, ref float value, ref fl
 
             MinMaxSlider(sliderRect, ref value, ref size, newVisualStart, newVisualEnd, newVisualStart, newVisualEnd, slider, thumb, horiz);
 
-            bool wasMouseUpEvent = false;
-            if (Event.current.type == EventType.MouseUp)
-                wasMouseUpEvent = true;
-
             if (ScrollerRepeatButton(id, minRect, leftButton))
                 value -= scrollStepSize * (visualStart < visualEnd ? 1f : -1f);
 
             if (ScrollerRepeatButton(id, maxRect, rightButton))
                 value += scrollStepSize * (visualStart < visualEnd ? 1f : -1f);
 
-            if (wasMouseUpEvent && Event.current.type == EventType.Used) // repeat buttons ate mouse up event - release scrolling
+            if (Event.current.type == EventType.MouseUp && Event.current.type == EventType.Used) // repeat buttons ate mouse up event - release scrolling
                 scrollControlID = 0;
 
             if (startLimit < endLimit)

diff --git a/Editor/Mono/Animation/StateMachine.cs b/Editor/Mono/Animation/StateMachine.cs
@@ -55,7 +55,7 @@ public void DoUndo(Object target, string undoOperation)
             }
 
             public bool m_PushUndo;
-        };
+        }
     }
 
 

diff --git a/Editor/Mono/Animation/TimeArea.cs b/Editor/Mono/Animation/TimeArea.cs
@@ -44,7 +44,7 @@ public enum TimeFormat
             None, // Unformatted time
             TimeFrame, // Time:Frame
             Frame // Integer frame
-        };
+        }
 
         class Styles2
         {
@@ -501,7 +501,7 @@ public string FormatTime(float time, float frameRate, TimeFormat timeFormat)
                     sign = "-";
                     frame = -frame;
                 }
-                return sign + (frame / (int)frameRate).ToString() + ":" +
+                return sign + (frame / (int)frameRate) + ":" +
                     (frame % frameRate).ToString().PadLeft(frameDigits, '0');
             }
             else