Unity 2023.2.0a8 C# reference source code

Author: Unity Technologies

Editor/Mono/BuildPlayerSceneTreeView.cs

@@ -13,35 +13,44 @@ internal class BuildPlayerSceneTreeViewItem : TreeViewItem
     {
         private const string kAssetsFolder = "Assets/";
         private const string kSceneExtension = ".unity";
-
         public static int kInvalidCounter = -1;
 
+        private string m_FullName;
+
         public bool active;
         public int counter;
-        public string fullName;
-        public GUID guid;
-        public void UpdateName()
+        public string fullName
         {
-            var name = AssetDatabase.GUIDToAssetPath(guid.ToString());
-            if (name != fullName)
+            get => m_FullName;
+            set
             {
-                fullName = name;
+                if (m_FullName == value)
+                    return;
 
-                displayName = fullName;
+                m_FullName = value;
+                displayName = m_FullName;
                 if (displayName.StartsWith(kAssetsFolder))
                     displayName = displayName.Remove(0, kAssetsFolder.Length);
                 var ext = displayName.LastIndexOf(kSceneExtension);
                 if (ext > 0)
                     displayName = displayName.Substring(0, ext);
             }
         }
+        public GUID guid;
+
+        public void UpdateName()
+        {
+            var name = AssetDatabase.GUIDToAssetPath(guid.ToString());
+            if (!string.IsNullOrEmpty(name) && name != fullName)
+                fullName = name;
+        }
 
-        public BuildPlayerSceneTreeViewItem(int id, int depth, GUID g, bool state) : base(id, depth)
+        public BuildPlayerSceneTreeViewItem(EditorBuildSettingsScene scene) : base(scene.guid.GetHashCode(), 0)
         {
-            active = state;
+            active = scene.enabled;
             counter = kInvalidCounter;
-            guid = g;
-            fullName = "";
+            guid = scene.guid;
+            fullName = scene.path;
             UpdateName();
         }
     }
@@ -71,7 +80,7 @@ protected override TreeViewItem BuildRoot()
             List<EditorBuildSettingsScene> scenes = new List<EditorBuildSettingsScene>(EditorBuildSettings.scenes);
             foreach (var sc in scenes)
             {
-                var item = new BuildPlayerSceneTreeViewItem(sc.guid.GetHashCode(), 0, sc.guid, sc.enabled);
+                var item = new BuildPlayerSceneTreeViewItem(sc);
                 root.AddChild(item);
             }
             return root;
@@ -314,6 +323,11 @@ public EditorBuildSettingsScene[] GetSceneList()
             {
                 var sceneItem = rootItem.children[index] as BuildPlayerSceneTreeViewItem;
                 sceneList[index] = new EditorBuildSettingsScene(sceneItem.fullName, sceneItem.active);
+
+                // If the scene was deleted AssetPathToGUID may not work and the guid will be lost
+                // In that case restore it to the previous value
+                if (sceneList[index].guid.Empty() && !sceneItem.guid.Empty())
+                    sceneList[index].guid = sceneItem.guid;
             }
             return sceneList;
         }

Editor/Mono/BuildPlayerWindowBuildMethods.cs

@@ -313,7 +313,7 @@ internal static BuildPlayerOptions GetBuildPlayerOptionsInternal(bool askForBuil
                 EditorBuildSettingsScene[] editorScenes = EditorBuildSettings.scenes;
                 foreach (EditorBuildSettingsScene scene in editorScenes)
                 {
-                    if (scene.enabled)
+                    if (scene.enabled && !string.IsNullOrEmpty(scene.path))
                         scenesList.Add(scene.path);
                 }
 

Editor/Mono/EditorBuildSettings.bindings.cs

@@ -45,7 +45,7 @@ public EditorBuildSettingsScene(GUID guid, bool enabled)
         public GUID guid { get { return m_guid; } set { m_guid = value; } }
         public static string[] GetActiveSceneList(EditorBuildSettingsScene[] scenes)
         {
-            return scenes.Where(scene => scene.enabled).Select(scene => scene.path).ToArray();
+            return scenes.Where(scene => scene.enabled && !string.IsNullOrEmpty(scene.path)).Select(scene => scene.path).ToArray();
         }
 
         public int CompareTo(object obj)
@@ -74,27 +74,10 @@ private static void SceneListChanged()
 
         public static EditorBuildSettingsScene[] scenes
         {
-            get
-            {
-                var result = GetEditorBuildSettingsScenes();
-                foreach (var scene in result)
-                {
-                    if (scene.guid.Empty())
-                    {
-                        scene.guid = new GUID(AssetDatabase.AssetPathToGUID(scene.path));
-                    }
-                    else
-                    {
-                        scene.path = AssetDatabase.GUIDToAssetPath(scene.guid.ToString());
-                    }
-                }
-                return result;
-            }
-            set
-            {
-                SetEditorBuildSettingsScenes(value);
-            }
+            get => GetEditorBuildSettingsScenes();
+            set => SetEditorBuildSettingsScenes(value);
         }
+
         static extern EditorBuildSettingsScene[] GetEditorBuildSettingsScenes();
         static extern void SetEditorBuildSettingsScenes(EditorBuildSettingsScene[] scenes);
 

Editor/Mono/EditorTextSettings.cs

@@ -19,6 +19,7 @@ namespace UnityEditor
     internal class EditorTextSettings : TextSettings
     {
         private static EditorTextSettings s_DefaultTextSettings;
+        private static float s_CurrentEditorSharpness;
 
         const string k_DefaultEmojisFallback = "UIPackageResources/FontAssets/Emojis/";
         const string k_Platform =
@@ -27,8 +28,21 @@ internal class EditorTextSettings : TextSettings
         static EditorTextSettings()
         {
             IMGUITextHandle.GetEditorTextSettings = () => defaultTextSettings;
-            IMGUITextHandle.GetEditorTextSharpness = (string fontAssetName) => EditorPrefs.GetFloat($"EditorTextSharpness_{fontAssetName}", 0.0f);
-            IMGUITextHandle.GetEditorFont = () => EditorResources.GetFont(FontDef.Style.Normal);
+        }
+
+        internal static void SetCurrentEditorSharpness(float sharpness)
+        {
+            s_CurrentEditorSharpness = sharpness;
+        }
+
+        internal override float GetEditorTextSharpness()
+        {
+            return s_CurrentEditorSharpness;
+        }
+
+        internal override Font GetEditorFont()
+        {
+            return EditorResources.GetFont(FontDef.Style.Normal);
         }
 
         internal static EditorTextSettings defaultTextSettings

Editor/Mono/EditorUserBuildSettings.bindings.cs

@@ -331,6 +331,23 @@ public enum QNXOsVersion
     }
 
     [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
+    public enum EmbeddedArchitecture
+    {
+        [UnityEngine.InspectorName("Arm64")]
+        Arm64 = 0,
+
+        [UnityEngine.InspectorName("Arm32")]
+        Arm32 = 1,
+
+        [UnityEngine.InspectorName("X64")]
+        X64 = 2,
+
+        [UnityEngine.InspectorName("X86")]
+        X86 = 3,
+    }
+
+    [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
+    [Obsolete("QNXArchitecture is deprecated. Use EmbeddedArchitecture. (UnityUpgradeable) -> EmbeddedArchitecture")]
     public enum QNXArchitecture
     {
         [UnityEngine.InspectorName("Arm64")]
@@ -347,6 +364,7 @@ public enum QNXArchitecture
     }
 
     [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
+    [Obsolete("EmbeddedLinuxArchitecture is deprecated. Use EmbeddedArchitecture. (UnityUpgradeable) -> EmbeddedArchitecture")]
     public enum EmbeddedLinuxArchitecture
     {
         [UnityEngine.InspectorName("Arm64")]
@@ -396,7 +414,7 @@ public static extern QNXOsVersion selectedQnxOsVersion
         }
 
         // QNX Architecture
-        public static extern QNXArchitecture selectedQnxArchitecture
+        public static extern EmbeddedArchitecture selectedQnxArchitecture
         {
             [NativeMethod("GetSelectedQNXArchitecture")]
             get;
@@ -405,15 +423,15 @@ public static extern QNXArchitecture selectedQnxArchitecture
         }
 
         // Embedded Linux Architecture
-        public static extern EmbeddedLinuxArchitecture selectedEmbeddedLinuxArchitecture
+        public static extern EmbeddedArchitecture selectedEmbeddedLinuxArchitecture
         {
             [NativeMethod("GetSelectedEmbeddedLinuxArchitecture")]
             get;
             [NativeMethod("SetSelectedEmbeddedLinuxArchitecture")]
             set;
         }
 
-        // Embedded Linux remote device information
+        // Embedded Linux && QNX remote device information
         public static extern bool remoteDeviceInfo { get; set; }
         public static extern string remoteDeviceAddress { get; set; }
         public static extern string remoteDeviceUsername { get; set; }

Editor/Mono/EventWithPerformanceTracker.cs

@@ -422,7 +422,7 @@ public Invoker UpdateAndInvoke(T value)
             return new Invoker(ref m_Delegates);
         }
 
-        internal readonly ref struct Invoker
+        internal readonly struct Invoker
         {
             private readonly EventWithPerformanceTracker.Entry m_Delegates;
             public Enumerator GetEnumerator() => new Enumerator(in this);

Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs

@@ -413,8 +413,6 @@ override protected void DoItemGUI(Rect rect, int row, TreeViewItem item, bool se
             if (goItem == null)
                 return;
 
-            EnsureLazyInitialization(goItem);
-
             if (goItem.isSceneHeader)
             {
                 useBoldFont = (goItem.scene == SceneManager.GetActiveScene());
@@ -686,6 +684,8 @@ protected override void OnContentGUI(Rect rect, int row, TreeViewItem item, stri
             if (goItem == null)
                 return;
 
+            EnsureLazyInitialization(goItem);
+
             rect.xMax = m_ContentRectRight;
 
             if (goItem.isSceneHeader)

Editor/Mono/GameView/GameViewSizes.cs

@@ -264,13 +264,7 @@ private void InitBuiltinGroups()
 
         internal static bool DefaultLowResolutionSettingForStandalone()
         {
-            switch (EditorUserBuildSettings.activeBuildTarget)
-            {
-                case BuildTarget.StandaloneOSX:
-                    return !PlayerSettings.macRetinaSupport; // if retina support enabled -> expecting LowRes setting disabled by default
-                default:
-                    return GUIUtility.pixelsPerPoint <= 1.0f;
-            }
+            return GUIUtility.pixelsPerPoint <= 1.0f;
         }
 
         internal static bool DefaultLowResolutionSettingForSizeGroupType(GameViewSizeGroupType sizeGroupType)

Editor/Mono/Inspector/MonoScriptInspector.cs

@@ -276,11 +276,11 @@ public override void OnInspectorGUI()
 
                     if (assemblyDefinitionFile != null)
                     {
-                        var assemblyDefintionFileAsset = AssetDatabase.LoadAssetAtPath<TextAsset>(assemblyDefinitionFile);
+                        var assemblyDefinitionFileAsset = AssetDatabase.LoadAssetAtPath<TextAsset>(assemblyDefinitionFile);
 
                         using (new EditorGUI.DisabledScope(true))
                         {
-                            EditorGUILayout.ObjectField("Definition File", assemblyDefintionFileAsset, typeof(TextAsset), false);
+                            EditorGUILayout.ObjectField("Definition File", assemblyDefinitionFileAsset, typeof(TextAsset), false);
                         }
                     }
 

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -94,6 +94,7 @@ class SettingsContent
             public static readonly GUIContent platformShaderChunkCount = EditorGUIUtility.TrTextContent("Chunk count", "Use this setting to control how much memory is used when loading shader variants.");
 
             public static readonly GUIContent bakeCollisionMeshes = EditorGUIUtility.TrTextContent("Prebake Collision Meshes*", "Bake collision data into the meshes on build time");
+            public static readonly GUIContent dedicatedServerOptimizations = EditorGUIUtility.TrTextContent("Enable Dedicated Server optimizations", "Performs additional optimizations on Dedicated Server builds.");
             public static readonly GUIContent keepLoadedShadersAlive = EditorGUIUtility.TrTextContent("Keep Loaded Shaders Alive*", "Prevents shaders from being unloaded");
             public static readonly GUIContent preloadedAssets = EditorGUIUtility.TrTextContent("Preloaded Assets*", "Assets to load at start up in the player and kept alive until the player terminates");
             public static readonly GUIContent stripEngineCode = EditorGUIUtility.TrTextContent("Strip Engine Code*", "Strip Unused Engine Code - Note that byte code stripping of managed assemblies is always enabled for the IL2CPP scripting backend.");
@@ -416,6 +417,7 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_KeepLoadedShadersAlive;
         SerializedProperty m_PreloadedAssets;
         SerializedProperty m_BakeCollisionMeshes;
+        SerializedProperty m_DedicatedServerOptimizations;
         SerializedProperty m_ResizableWindow;
         SerializedProperty m_FullscreenMode;
         SerializedProperty m_VisibleInBackground;
@@ -638,6 +640,7 @@ void OnEnable()
             m_KeepLoadedShadersAlive           = FindPropertyAssert("keepLoadedShadersAlive");
             m_PreloadedAssets                  = FindPropertyAssert("preloadedAssets");
             m_BakeCollisionMeshes              = FindPropertyAssert("bakeCollisionMeshes");
+            m_DedicatedServerOptimizations     = FindPropertyAssert("dedicatedServerOptimizations");
             m_ResizableWindow                  = FindPropertyAssert("resizableWindow");
             m_UseMacAppStoreValidation         = FindPropertyAssert("useMacAppStoreValidation");
             m_MacAppStoreCategory              = FindPropertyAssert("macAppStoreCategory");
@@ -3192,6 +3195,9 @@ private void OtherSectionOptimizationGUI(BuildPlatform platform)
             // Optimization
             GUILayout.Label(SettingsContent.optimizationTitle, EditorStyles.boldLabel);
 
+            if (platform.namedBuildTarget == NamedBuildTarget.Server)
+                EditorGUILayout.PropertyField(m_DedicatedServerOptimizations, SettingsContent.dedicatedServerOptimizations);
+
             EditorGUILayout.PropertyField(m_BakeCollisionMeshes, SettingsContent.bakeCollisionMeshes);
 
             if (isPreset)