Unity 2020.1.0a5 C# reference source code

Author: Unity Technologies

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

@@ -199,7 +199,7 @@ void OnEnable()
             m_PackableList.onRemoveCallback = RemovePackable;
             m_PackableList.drawElementCallback = DrawPackableElement;
             m_PackableList.elementHeight = EditorGUIUtility.singleLineHeight;
-            m_PackableList.headerHeight = 0f;
+            m_PackableList.headerHeight = 3f;
 
             SyncPlatformSettings();
 

Editor/Mono/Animation/AnimationWindow/AnimEditor.cs

@@ -94,15 +94,15 @@ static private Color filterBySelectionColor
             }
         }
 
-        internal const int kSliderThickness = 15;
+        internal const int kSliderThickness = 13;
         internal const int kIntFieldWidth = 35;
         internal const int kHierarchyMinWidth = 300;
         internal const int kToggleButtonWidth = 80;
         internal const float kDisabledRulerAlpha = 0.12f;
 
         private int layoutRowHeight
         {
-            get { return (int)EditorGUI.kWindowToolbarHeight + 1; }
+            get { return (int)EditorGUI.kWindowToolbarHeight; }
         }
 
         internal struct FrameRateMenuEntry
@@ -227,9 +227,10 @@ public void OnAnimEditorGUI(EditorWindow parent, Rect position)
                 HierarchyOnGUI();
 
                 // Bottom row of controls
-                GUILayout.BeginHorizontal(AnimationWindowStyles.miniToolbar);
-                TabSelectionOnGUI();
-                GUILayout.EndHorizontal();
+                using (new GUILayout.HorizontalScope(AnimationWindowStyles.toolbarBottom))
+                {
+                    TabSelectionOnGUI();
+                }
 
                 GUILayout.EndVertical();
 
@@ -254,7 +255,10 @@ public void OnAnimEditorGUI(EditorWindow parent, Rect position)
                 OverlayOnGUI(contentLayoutRect);
 
                 if (Event.current.type == EventType.Repaint)
+                {
                     OptionsOnGUI(optionsID);
+                    AnimationWindowStyles.separator.Draw(new Rect(hierarchyWidth, 0, 1, position.height), false, false, false, false);
+                }
 
                 RenderEventTooltip();
             }
@@ -525,7 +529,7 @@ private void TabSelectionOnGUI()
             GUILayout.FlexibleSpace();
             EditorGUI.BeginChangeCheck();
             GUILayout.Toggle(!m_State.showCurveEditor, AnimationWindowStyles.dopesheet, AnimationWindowStyles.miniToolbarButton, GUILayout.Width(kToggleButtonWidth));
-            GUILayout.Toggle(m_State.showCurveEditor, AnimationWindowStyles.curves, AnimationWindowStyles.miniToolbarButton, GUILayout.Width(kToggleButtonWidth));
+            GUILayout.Toggle(m_State.showCurveEditor, AnimationWindowStyles.curves, EditorStyles.toolbarButtonRight, GUILayout.Width(kToggleButtonWidth));
             if (EditorGUI.EndChangeCheck())
             {
                 SwitchBetweenCurvesAndDopesheet();
@@ -666,7 +670,6 @@ private void TimeRulerOnGUI(Rect timeRulerRect)
             Rect timeRulerRectNoScrollbar = new Rect(timeRulerRect.xMin, timeRulerRect.yMin, timeRulerRect.width - kSliderThickness, timeRulerRect.height);
             Rect timeRulerBackgroundRect = timeRulerRectNoScrollbar;
 
-            timeRulerBackgroundRect.y += 2;
             GUI.Box(timeRulerBackgroundRect, GUIContent.none, AnimationWindowStyles.timeRulerBackground);
 
             if (!m_State.disabled)
@@ -717,14 +720,14 @@ private GenericMenu GenerateOptionsMenu()
 
         private void OptionsOnGUI(int controlID)
         {
-            Rect layoutRect = new Rect(hierarchyWidth - 1f, 1f, contentWidth, layoutRowHeight);
+            Rect layoutRect = new Rect(hierarchyWidth, 0f, contentWidth, layoutRowHeight);
 
             GUI.BeginGroup(layoutRect);
 
-            Vector2 optionsSize = EditorStyles.toolbarButton.CalcSize(AnimationWindowStyles.optionsContent);
-            Rect optionsRect = new Rect(layoutRect.width - optionsSize.x, 0f, optionsSize.x, optionsSize.y);
-
-            if (EditorGUI.DropdownButton(controlID, optionsRect, AnimationWindowStyles.optionsContent, EditorStyles.toolbarButton))
+            Vector2 optionsSize = EditorStyles.toolbarButtonRight.CalcSize(AnimationWindowStyles.optionsContent);
+            Rect optionsRect = new Rect(layoutRect.width - kSliderThickness, 0f, optionsSize.x, optionsSize.y);
+            GUI.Box(optionsRect, GUIContent.none, AnimationWindowStyles.animPlayToolBar);
+            if (EditorGUI.DropdownButton(controlID, optionsRect, AnimationWindowStyles.optionsContent, AnimationWindowStyles.optionsButton))
             {
                 var menu = GenerateOptionsMenu();
                 menu.ShowAsContext();

Editor/Mono/Animation/AnimationWindow/AnimationWindowStyles.cs

@@ -38,7 +38,7 @@ internal class AnimationWindowStyles
         public static GUIContent readOnlyPropertiesLabel = EditorGUIUtility.TrTextContent("Animation Clip is Read-Only");
         public static GUIContent readOnlyPropertiesButton = EditorGUIUtility.TrTextContent("Show Read-Only Properties");
 
-        public static GUIContent optionsContent = EditorGUIUtility.IconContent("_Popup");
+        public static GUIContent optionsContent = EditorGUIUtility.IconContent("_Menu");
 
         public static GUIStyle playHead = "AnimationPlayHead";
 
@@ -60,14 +60,19 @@ internal class AnimationWindowStyles
         public static GUIStyle popupCurveEditorBackground = "PopupCurveEditorBackground";
         public static GUIStyle popupCurveEditorSwatch = "PopupCurveEditorSwatch";
         public static GUIStyle popupCurveSwatchBackground = "PopupCurveSwatchBackground";
+        public static GUIStyle separator = new GUIStyle("AnimLeftPaneSeparator");
 
-        public static GUIStyle miniToolbar = "PreToolbar";
+        public static GUIStyle toolbarBottom = "ToolbarBottom";
+        public static GUIStyle optionsButton = new GUIStyle(EditorStyles.toolbarButtonRight);
         public static GUIStyle miniToolbarButton = new GUIStyle(EditorStyles.toolbarButton);
         public static GUIStyle toolbarLabel = new GUIStyle(AnimationWindowStyles.animClipToolbarPopup);
 
         public static void Initialize()
         {
             toolbarLabel.normal.background = null;
+            optionsButton.padding = new RectOffset();
+            optionsButton.imagePosition = ImagePosition.ImageOnly;
+            optionsButton.contentOffset = new Vector2(-7, 0);
         }
     }
 }

Editor/Mono/Annotation/SceneViewCameraWindow.cs

@@ -46,6 +46,9 @@ public static void Init()
         const float kPrefixLabelWidth = 120f;
         const float kNearClipMin = .01f;
         const int k_HeaderSpacing = 2;
+        // FOV values chosen to be the smallest and largest before extreme visual corruption
+        const float k_MinFieldOfView = 4f;
+        const float k_MaxFieldOfView = 160f;
 
         Vector2 m_WindowSize;
         Vector2 m_Scroll;
@@ -118,7 +121,7 @@ void Draw(Rect rect)
             // fov isn't applicable in orthographic mode, and orthographic size is controlled by the user zoom
             using (new EditorGUI.DisabledScope(m_SceneView.orthographic))
             {
-                settings.fieldOfView = EditorGUILayout.Slider(m_FieldOfView, settings.fieldOfView, 4f, 179f);
+                settings.fieldOfView = EditorGUILayout.Slider(m_FieldOfView, settings.fieldOfView, k_MinFieldOfView, k_MaxFieldOfView);
             }
 
             settings.dynamicClip = EditorGUILayout.Toggle(m_DynamicClip, settings.dynamicClip);
@@ -127,11 +130,7 @@ void Draw(Rect rect)
             {
                 float near = settings.nearClip, far = settings.farClip;
                 DrawClipPlanesField(EditorGUI.s_ClipingPlanesLabel, ref near, ref far, EditorGUI.kNearFarLabelsWidth);
-                settings.nearClip = near;
-                settings.farClip = far;
-                settings.nearClip = Mathf.Max(kNearClipMin, settings.nearClip);
-                if (settings.nearClip > settings.farClip)
-                    settings.farClip = settings.nearClip + kNearClipMin;
+                settings.SetClipPlanes(near, far);
             }
 
             settings.occlusionCulling = EditorGUILayout.Toggle(m_OcclusionCulling, settings.occlusionCulling);

Editor/Mono/AssemblyHelper.cs

@@ -327,44 +327,12 @@ struct GetAssemblyResolverData
             public string[] SearchDirs;
         }
 
-        static GetAssemblyResolverData GetAssemblyResolver(BuildTarget targetPlatform, bool isEditor, string assemblyPathName, string[] searchDirs)
-        {
-            var target = ModuleManager.GetTargetStringFromBuildTarget(targetPlatform);
-            var extension = ModuleManager.GetCompilationExtension(target);
-            var extraPaths = extension.GetCompilerExtraAssemblyPaths(isEditor, assemblyPathName);
-            if (extraPaths != null && extraPaths.Length > 0)
-            {
-                var dirs = new List<string>(searchDirs);
-                dirs.AddRange(extraPaths);
-                searchDirs = dirs.ToArray();
-            }
-
-            var assemblyResolver = extension.GetAssemblyResolver(isEditor, assemblyPathName, searchDirs);
-
-            return new GetAssemblyResolverData
-            {
-                Resolver = assemblyResolver,
-                SearchDirs = searchDirs
-            };
-        }
-
         /// Extract information about all types in the specified assembly, searchDirs might be used to resolve dependencies.
         static public AssemblyTypeInfoGenerator.ClassInfo[] ExtractAssemblyTypeInfo(BuildTarget targetPlatform, bool isEditor, string assemblyPathName, string[] searchDirs)
         {
             try
             {
-                var assemblyResolverData = GetAssemblyResolver(targetPlatform, isEditor, assemblyPathName, searchDirs);
-
-                AssemblyTypeInfoGenerator gen;
-                if (assemblyResolverData.Resolver == null)
-                {
-                    gen = new AssemblyTypeInfoGenerator(assemblyPathName, assemblyResolverData.SearchDirs);
-                }
-                else
-                {
-                    gen = new AssemblyTypeInfoGenerator(assemblyPathName, assemblyResolverData.Resolver);
-                }
-
+                AssemblyTypeInfoGenerator gen = new AssemblyTypeInfoGenerator(assemblyPathName, searchDirs);
                 return gen.GatherClassInfo();
             }
             catch (System.Exception ex)
@@ -426,16 +394,12 @@ public static RuntimeInitializeOnLoadMethodsData ExtractPlayerRuntimeInitializeO
             {
                 try
                 {
-                    var assemblyResolverData = GetAssemblyResolver(targetPlatform, false, assemblyPath, searchDirs);
-
-                    if (assemblyResolverData.Resolver == null)
-                    {
-                        var resolver = new DefaultAssemblyResolver();
-                        foreach (var searchDir in searchDirs)
-                            resolver.AddSearchDirectory(searchDir);
+                    var assemblyResolverData = new GetAssemblyResolverData { SearchDirs = searchDirs, };
+                    var resolver = new DefaultAssemblyResolver();
+                    foreach (var searchDir in searchDirs)
+                        resolver.AddSearchDirectory(searchDir);
 
-                        assemblyResolverData.Resolver = resolver;
-                    }
+                    assemblyResolverData.Resolver = resolver;
 
                     var assembly = AssemblyDefinition.ReadAssembly(assemblyPath, new ReaderParameters
                     {

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -108,5 +108,6 @@
 [assembly: InternalsVisibleTo("Unity.2D.Sprite.EditorTests")]
 [assembly: InternalsVisibleTo("Unity.2D.Tilemap.Editor")]
 [assembly: InternalsVisibleTo("Unity.2D.Tilemap.EditorTests")]
+[assembly: InternalsVisibleTo("Unity.PackageCleanConsoleTest.Editor")]
 
 [assembly: AssemblyIsEditorAssembly]

Editor/Mono/AssetDatabase/AssetDatabase.cs

@@ -23,6 +23,9 @@ public sealed partial class AssetDatabase
         // Delegate to be called when package import completes
         public static event ImportPackageCallback importPackageCompleted;
 
+        // Called when package import completes, listing the selected items
+        public static Action<string[]> onImportPackageItemsCompleted;
+
         // Delegate to be called when package import is cancelled
         public static event ImportPackageCallback importPackageCancelled;
 
@@ -43,6 +46,13 @@ private static void Internal_CallImportPackageCompleted(string packageName)
                 importPackageCompleted(packageName);
         }
 
+        [RequiredByNativeCode]
+        private static void Internal_CallOnImportPackageItemsCompleted(string[] items)
+        {
+            if (onImportPackageItemsCompleted != null)
+                onImportPackageItemsCompleted(items);
+        }
+
         [RequiredByNativeCode]
         private static void Internal_CallImportPackageCancelled(string packageName)
         {

Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs

@@ -80,6 +80,19 @@ internal void DependsOnImportedAsset(string path)
         [NativeName("DependsOnImportedAsset")]
         private extern void DependsOnImportedAssetInternal(string path);
 
+        public void DependsOnCustomDependency(string dependency)
+        {
+            if (string.IsNullOrEmpty(dependency))
+            {
+                throw new ArgumentNullException("dependency", "Cannot add custom dependency on an empty custom dependency.");
+            }
+
+            DependsOnCustomDependencyInternal(dependency);
+        }
+
+        [NativeName("DependsOnCustomDependency")]
+        private extern void DependsOnCustomDependencyInternal(string path);
+
         public void LogImportError(string msg, UnityEngine.Object obj = null)
         {
             AddToLog(msg, true, obj);

Editor/Mono/Audio/Mixer/GUI/AudioMixerDrawUtils.cs

@@ -182,7 +182,7 @@ public static void DrawRegionBg(Rect rect, out Rect headerRect, out Rect content
             const float headerIndent = 2f;
             headerRect = new Rect(rect.x + headerIndent, rect.y, rect.width - headerIndent, kSectionHeaderHeight);
             contentRect = new Rect(rect.x, headerRect.yMax, rect.width, rect.height - kSectionHeaderHeight);
-            GUI.Label(new RectOffset(1, 1, 1, 1).Add(contentRect), GUIContent.none, EditorStyles.helpBox);
+            GUI.Label(new RectOffset(1, 1, 1, 1).Add(contentRect), GUIContent.none, EditorStyles.frameBox);
         }
 
         public static void HeaderLabel(Rect r, GUIContent text, Texture2D icon)

Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupTreeView.cs

@@ -152,7 +152,8 @@ public override bool IsRenamingItemAllowed(TreeViewItem node)
     internal class AudioGroupTreeViewGUI : TreeViewGUI
     {
         readonly float column1Width = 20f;
-        readonly Texture2D k_VisibleON = EditorGUIUtility.FindTexture("VisibilityOn");
+        readonly GUIContent k_VisibleON = EditorGUIUtility.TrIconContent("animationvisibilitytoggleon");
+        readonly GUIContent k_VisibleOFF = EditorGUIUtility.TrIconContent("animationvisibilitytoggleoff");
         public Action<AudioMixerTreeViewNode, bool> NodeWasToggled;
         public AudioMixerController m_Controller = null;
 
@@ -206,9 +207,10 @@ override public void OnRowGUI(Rect rowRect, TreeViewItem node, int row, bool sel
                 if (colorIndex > 0)
                     EditorGUI.DrawRect(new Rect(rowRect.x, iconBgRect.y, 2, iconBgRect.height), AudioMixerColorCodes.GetColor(colorIndex));
 
-                EditorGUI.DrawRect(iconBgRect, new Color(0.5f, 0.5f, 0.5f, 0.2f));
                 if (oldSelected)
-                    GUI.DrawTexture(iconRect, k_VisibleON);
+                    GUI.DrawTexture(iconRect, k_VisibleON.image);
+                else
+                    GUI.DrawTexture(iconRect, k_VisibleOFF.image);
 
                 Rect toggleRect = new Rect(2, rowRect.y, rowRect.height, rowRect.height);
                 if (evt.type == EventType.MouseUp && evt.button == 0 && toggleRect.Contains(evt.mousePosition))
@@ -290,7 +292,7 @@ internal class AudioMixerGroupTreeView
         class Styles
         {
             public GUIContent header = EditorGUIUtility.TrTextContent("Groups", "An Audio Mixer Group is used by e.g Audio Sources to modify the audio output before it reaches the Audio Listener. An Audio Mixer Group will route its output to another Audio Mixer Group if it is made a child of that group. The Master Group will route its output to the Audio Listener if it doesn't route its output into another Mixer.");
-            public GUIContent addText = EditorGUIUtility.TrTextContent("+", "Add child group");
+            public GUIContent addButton = EditorGUIUtility.TrIconContent("CreateAddNew", "Add child group");
             public Texture2D audioMixerGroupIcon = EditorGUIUtility.FindTexture(typeof(UnityEngine.Audio.AudioMixerGroup));
         }
         static Styles s_Styles;
@@ -567,7 +569,7 @@ public void OnGUI(Rect rect)
                 AudioMixerGroupController parent = (m_Controller.CachedSelection.Count == 1) ? m_Controller.CachedSelection[0] : m_Controller.masterGroup;
                 using (new EditorGUI.DisabledScope(EditorApplication.isPlaying))
                 {
-                    if (GUI.Button(new Rect(headerRect.xMax - 15f, headerRect.y + 3f, 15f, 15f), s_Styles.addText, EditorStyles.label))
+                    if (GUI.Button(new Rect(headerRect.xMax - 17f, headerRect.y + 3f, 16f, 16f), s_Styles.addButton, EditorStyles.iconButton))
                         AddAudioMixerGroup(parent);
                 }