Unity 2021.1.0a7 C# reference source code

Author: Unity Technologies

Editor/Mono/AssetDatabase/AssetDatabase.deprecated.cs

@@ -137,7 +137,7 @@ public struct CacheServerConnectionChangedParameters
         public extern static UInt32 UnregisterCustomDependencyPrefixFilter(string prefixFilter);
 
         [FreeFunction("AssetDatabase::IsAssetImportProcess")]
-        [Obsolete("AssetDatabaseExperimental.IsAssetImportWorkerProcess() has been deprecated. Use AssetDatabase.IsAssetImportWorkerProcess()", false)]
+        [Obsolete("AssetDatabaseExperimental.IsAssetImportWorkerProcess() has been deprecated. Use AssetDatabase.IsAssetImportWorkerProcess() instead (UnityUpgradable) -> UnityEditor.AssetDatabase.IsAssetImportWorkerProcess(*)", false)]
         public extern static bool IsAssetImportWorkerProcess();
 
         [Obsolete("Has been replaced by AssetDatabaseExperimental.RefreshSettings", true)]

Editor/Mono/AssetPipeline/TextureImporterEnums.cs

@@ -295,27 +295,28 @@ public enum TextureImporterSingleChannelComponent
     public enum TextureImporterType
     {
         Default = 0,
-        [System.Obsolete("Use Default (UnityUpgradable) -> Default")]
-        Image = 0,
-        [System.Obsolete("Use NormalMap (UnityUpgradable) -> NormalMap")]
-        Bump = 1,
         NormalMap = 1,
         GUI = 2,
         Sprite = 8,
         Cursor = 7,
-        [System.Obsolete("Use importer.textureShape = TextureImporterShape.TextureCube")]
-        Cubemap = 3,
-        [System.Obsolete("Use a texture setup as a cubemap with glossy reflection instead")]
-        Reflection = 3,
         Cookie = 4,
         Lightmap = 6,
-        [System.Obsolete("HDRI is not supported anymore")]
-        HDRI = 9,
-        [System.Obsolete("Use Default instead. All texture types now have an Advanced foldout (UnityUpgradable) -> Default")]
-        Advanced = 5,
         SingleChannel = 10,
         Shadowmask = 11,
         DirectionalLightmap = 12,
+
+        [System.Obsolete("Use Default (UnityUpgradable) -> Default", true)]
+        Image = Int32.MinValue,
+        [System.Obsolete("Use NormalMap (UnityUpgradable) -> NormalMap", true)]
+        Bump = -1,
+        [System.Obsolete("Use importer.textureShape = TextureImporterShape.TextureCube", true)]
+        Cubemap = -3,
+        [System.Obsolete("Use a texture setup as a cubemap with glossy reflection instead", true)]
+        Reflection = -3,
+        [System.Obsolete("Use Default instead. All texture types now have an Advanced foldout (UnityUpgradable) -> Default", true)]
+        Advanced = -5,
+        [System.Obsolete("HDRI is not supported anymore", true)]
+        HDRI = -9,
     }
 
     public enum TextureImporterCompression

Editor/Mono/BuildPipeline.bindings.cs

@@ -176,6 +176,14 @@ public enum BuildAssetBundleOptions
         AssetBundleStripUnityVersion = 32768 // 1 << 15
     }
 
+    // Keep in sync with CanAppendBuild in EditorUtility.h
+    public enum CanAppendBuild
+    {
+        Unsupported = 0,
+        Yes = 1,
+        No = 2,
+    }
+
     public struct AssetBundleBuild
     {
         public string   assetBundleName;
@@ -261,6 +269,9 @@ private static void LogBuildExceptionAndExit(string buildFunctionName, System.Ex
             EditorApplication.Exit(1);
         }
 
+        [FreeFunction]
+        public extern static CanAppendBuild BuildCanBeAppended(BuildTarget target, string location);
+
         public static BuildReport BuildPlayer(EditorBuildSettingsScene[] levels, string locationPathName, BuildTarget target, BuildOptions options)
         {
             BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions();
@@ -302,10 +313,10 @@ private static BuildReport BuildPlayer(string[] scenes, string locationPathName,
 
             if ((options & BuildOptions.AcceptExternalModificationsToPlayer) == BuildOptions.AcceptExternalModificationsToPlayer)
             {
-                UnityEditorInternal.CanAppendBuild canAppend = UnityEditorInternal.InternalEditorUtility.BuildCanBeAppended(target, locationPathName);
-                if (canAppend == UnityEditorInternal.CanAppendBuild.Unsupported)
+                CanAppendBuild canAppend = BuildCanBeAppended(target, locationPathName);
+                if (canAppend == CanAppendBuild.Unsupported)
                     throw new InvalidOperationException("The build target does not support build appending.");
-                if (canAppend == UnityEditorInternal.CanAppendBuild.No)
+                if (canAppend == CanAppendBuild.No)
                     throw new InvalidOperationException("The build cannot be appended.");
             }
 

Editor/Mono/BuildPipeline/Il2Cpp/Il2CppNativeCodeBuilderUtils.cs

@@ -12,6 +12,12 @@ namespace UnityEditorInternal
 {
     public static class Il2CppNativeCodeBuilderUtils
     {
+        public static string GetConfigurationName(Il2CppCompilerConfiguration compilerConfiguration)
+        {
+            // In IL2CPP, Master config is called "ReleasePlus"
+            return compilerConfiguration != Il2CppCompilerConfiguration.Master ? compilerConfiguration.ToString() : "ReleasePlus";
+        }
+
         public static IEnumerable<string> AddBuilderArguments(Il2CppNativeCodeBuilder builder, string outputRelativePath, IEnumerable<string> includeRelativePaths, IEnumerable<string> additionalLibs, Il2CppCompilerConfiguration compilerConfiguration)
         {
             var arguments = new List<string>();
@@ -21,10 +27,7 @@ public static IEnumerable<string> AddBuilderArguments(Il2CppNativeCodeBuilder bu
                 arguments.Add("--libil2cpp-static");
             arguments.Add(FormatArgument("platform", builder.CompilerPlatform));
             arguments.Add(FormatArgument("architecture", builder.CompilerArchitecture));
-
-            // In IL2CPP, Master config is called "ReleasePlus"
-            string configurationName = compilerConfiguration != Il2CppCompilerConfiguration.Master ? compilerConfiguration.ToString() : "ReleasePlus";
-            arguments.Add(FormatArgument("configuration", configurationName));
+            arguments.Add(FormatArgument("configuration", GetConfigurationName(compilerConfiguration)));
 
             arguments.Add(FormatArgument("outputpath", builder.ConvertOutputFileToFullPath(outputRelativePath)));
 

Editor/Mono/BuildPlayerWindow.cs

@@ -941,7 +941,7 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
             }
             GUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
-            if (EditorGUILayout.LinkLabel(styles.learnAboutUnityCloudBuild))
+            if (EditorGUILayout.LinkButton(styles.learnAboutUnityCloudBuild))
             {
                 Application.OpenURL(string.Format("{0}/from/editor/buildsettings?upid={1}&pid={2}&currentplatform={3}&selectedplatform={4}&unityversion={5}",
                     UnityEditorInternal.WebURLs.cloudBuildPage, CloudProjectSettings.projectId, PlayerSettings.productGUID, EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettingsUtils.CalculateSelectedBuildTarget(), Application.unityVersion));

Editor/Mono/BuildPlayerWindowBuildMethods.cs

@@ -279,7 +279,7 @@ internal static BuildPlayerOptions GetBuildPlayerOptionsInternal(bool askForBuil
 
                     if (!askForBuildLocation)
                     {
-                        switch (UnityEditorInternal.InternalEditorUtility.BuildCanBeAppended(buildTarget, newLocation))
+                        switch (BuildPipeline.BuildCanBeAppended(buildTarget, newLocation))
                         {
                             case CanAppendBuild.Unsupported:
                                 break;

Editor/Mono/Commands/CommandService.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using UnityEngine;
 using UnityEngine.Internal;
 
@@ -67,7 +68,7 @@ public class CommandExecuteContext
 
         public T GetArgument<T>(int index, T defaultValue = default(T))
         {
-            if (0 < index || index >= args.Length)
+            if (index < 0 || index >= args.Length)
                 throw new ArgumentOutOfRangeException(nameof(index));
             return (T)args[index];
         }
@@ -149,22 +150,22 @@ public static object Execute(string id, CommandHint hint, params object[] args)
         private static IEnumerable<Command> ScanAttributes()
         {
             var commands = new List<Command>();
-            var commandAttributes = AttributeHelper.GetMethodsWithAttribute<CommandHandlerAttribute>();
-            foreach (var method in commandAttributes.methodsWithAttributes)
+            foreach (var mi in TypeCache.GetMethodsWithAttribute<CommandHandlerAttribute>())
             {
-                var callback = Delegate.CreateDelegate(typeof(CommandHandler), method.info) as CommandHandler;
-                if (callback == null)
+                if (!(Delegate.CreateDelegate(typeof(CommandHandler), mi) is CommandHandler callback))
                     continue;
-                var attr = (CommandHandlerAttribute)method.attribute;
 
-                if (commands.Any(c => c.id == attr.id))
+                foreach (var attr in mi.GetCustomAttributes<CommandHandlerAttribute>())
                 {
-                    Debug.LogWarning($"There is already a command with the ID {attr.id}. " +
-                        "Commands need to have a unique ID, i.e. \"Unity/Category/Command_42\".");
-                    continue;
+                    if (commands.Any(c => c.id == attr.id))
+                    {
+                        Debug.LogWarning($"There is already a command with the ID {attr.id}. " +
+                            "Commands need to have a unique ID, i.e. \"Unity/Category/Command_42\".");
+                        continue;
+                    }
+
+                    commands.Add(new Command { id = attr.id, label = attr.label ?? attr.id, hint = attr.hint, handler = callback, managed = true });
                 }
-
-                commands.Add(new Command {id = attr.id, label = attr.label ?? attr.id, hint = attr.hint, handler = callback, managed = true});
             }
 
             return commands;

Editor/Mono/ConsoleWindow.cs

@@ -129,6 +129,9 @@ private static void UpdateLogStyleFixedHeights()
 
         Vector2 m_TextScroll = Vector2.zero;
 
+        int m_LastActiveEntryIndex = -1;
+        bool m_RestoreLatestSelection;
+
         //Make sure the minimum height of the panels can accomodate the cpmplete scroll bar icons
         SplitterState spl = SplitterState.FromRelative(new float[] {70, 30}, new float[] {60, 60}, null);
 
@@ -557,7 +560,10 @@ internal void OnGUI()
             bool setErrorFlag = GUILayout.Toggle(HasFlag(ConsoleFlags.LogLevelError), new GUIContent((errorCount <= 999 ? errorCount.ToString() : "999+"), errorCount > 0 ? iconErrorSmall : iconErrorMono), Constants.MiniButtonRight);
             // Active entry index may no longer be valid
             if (EditorGUI.EndChangeCheck())
+            {
                 SetActiveEntry(null);
+                m_LastActiveEntryIndex = -1;
+            }
 
             SetFlag(ConsoleFlags.LogLevelLog, setLogFlag);
             SetFlag(ConsoleFlags.LogLevelWarning, setWarningFlag);
@@ -578,11 +584,27 @@ internal void OnGUI()
                 int selectedRow = -1;
                 bool openSelectedItem = false;
                 bool collapsed = HasFlag(ConsoleFlags.Collapse);
+                float scrollPosY = m_ListView.scrollPos.y;
+
                 foreach (ListViewElement el in ListViewGUI.ListView(m_ListView, ListViewOptions.wantsRowMultiSelection, Constants.Box))
                 {
+                    // Destroy latest restore entry if needed
+                    if (e.type == EventType.ScrollWheel || e.type == EventType.Used)
+                        DestroyLatestRestoreEntry();
+
+                    // Make sure that scrollPos.y is always up to date after restoring last entry
+                    if (m_RestoreLatestSelection)
+                    {
+                        m_ListView.scrollPos.y = scrollPosY;
+                    }
+
                     if (e.type == EventType.MouseDown && e.button == 0 && el.position.Contains(e.mousePosition))
                     {
                         selectedRow = m_ListView.row;
+                        DestroyLatestRestoreEntry();
+                        LogEntry entry = new LogEntry();
+                        LogEntries.GetEntryInternal(m_ListView.row, entry);
+                        m_LastActiveEntryIndex = entry.globalLineIndex;
                         if (e.clickCount == 2)
                             openSelectedItem = true;
                     }
@@ -663,21 +685,28 @@ internal void OnGUI()
                 if (m_ListView.totalRows == 0 || m_ListView.row >= m_ListView.totalRows || m_ListView.row < 0)
                 {
                     if (m_ActiveText.Length != 0)
+                    {
                         SetActiveEntry(null);
+                        DestroyLatestRestoreEntry();
+                    }
                 }
                 else
                 {
                     LogEntry entry = new LogEntry();
                     LogEntries.GetEntryInternal(m_ListView.row, entry);
                     SetActiveEntry(entry);
+                    m_LastActiveEntryIndex = entry.globalLineIndex;
+
 
                     // see if selected entry changed. if so - clear additional info
                     LogEntries.GetEntryInternal(m_ListView.row, entry);
                     if (m_ListView.selectionChanged || !m_ActiveText.Equals(entry.message))
                     {
                         SetActiveEntry(entry);
+                        m_LastActiveEntryIndex = entry.globalLineIndex;
                     }
 
+
                     // If copy, get the messages from selected rows
                     if (e.type == EventType.ExecuteCommand && e.commandName == EventCommandNames.Copy && m_ListView.selectedItems != null)
                     {
@@ -751,13 +780,16 @@ private void SearchField(Event e)
             }
 
             string searchText = m_SearchText;
+
             if (e.type == EventType.KeyDown)
             {
                 if (e.keyCode == KeyCode.Escape)
                 {
                     searchText = string.Empty;
                     GUIUtility.keyboardControl = m_ListView.ID;
                     Repaint();
+                    if (!String.IsNullOrEmpty(m_SearchText))
+                        RestoreLastActiveEntry();
                 }
                 else if ((e.keyCode == KeyCode.UpArrow || e.keyCode == KeyCode.DownArrow) &&
                          GUI.GetNameOfFocusedControl() == searchBarName)
@@ -941,6 +973,7 @@ private void AddStackTraceLoggingMenu(GenericMenu menu)
 
         private void SetFilter(string filteringText)
         {
+            m_RestoreLatestSelection = String.IsNullOrEmpty(filteringText) && !String.IsNullOrEmpty(m_SearchText) && m_LastActiveEntryIndex != -1;
             if (filteringText == null)
             {
                 m_SearchText = "";
@@ -951,7 +984,38 @@ private void SetFilter(string filteringText)
                 m_SearchText = filteringText;
                 LogEntries.SetFilteringText(filteringText); // Reset the active entry when we change the filtering text
             }
-            SetActiveEntry(null);
+
+            if (m_RestoreLatestSelection)
+            {
+                RestoreLastActiveEntry();
+            }
+            else
+            {
+                SetActiveEntry(null);
+                DestroyLatestRestoreEntry();
+            }
+        }
+
+        void RestoreLastActiveEntry()
+        {
+            int rowIndex = LogEntries.GetEntryRowIndex(m_LastActiveEntryIndex);
+            if (rowIndex != -1)
+            {
+                ShowConsoleRow(rowIndex);
+                m_ListView.selectedItems = new bool[rowIndex + 1];
+                m_ListView.selectedItems[rowIndex] = true;
+                m_ListView.scrollPos.y = rowIndex * m_ListView.rowHeight;
+            }
+            else
+            {
+                SetActiveEntry(null);
+            }
+        }
+
+        void DestroyLatestRestoreEntry()
+        {
+            m_LastActiveEntryIndex = -1;
+            m_RestoreLatestSelection = false;
         }
 
         [UsedImplicitly] private static event EntryDoubleClickedDelegate entryWithManagedCallbackDoubleClicked;