Unity 6000.2.0a9 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchy.cs

@@ -44,6 +44,7 @@ internal class AnimationWindowHierarchy
         // Animation window shared state
         private AnimationWindowState m_State;
         private TreeViewController m_TreeView;
+        private AnimationWindowHierarchyGUI m_HierarchyGUI;
 
         public Vector2 GetContentSize()
         {
@@ -65,6 +66,7 @@ public void OnGUI(Rect position)
         {
             m_TreeView.OnEvent();
             m_TreeView.OnGUI(position, GUIUtility.GetControlID(FocusType.Keyboard));
+            m_HierarchyGUI.ReclaimPendingFieldFocus();
         }
 
         public void Init(EditorWindow owner, Rect rect)
@@ -74,9 +76,10 @@ public void Init(EditorWindow owner, Rect rect)
 
             m_TreeView = new TreeViewController(owner, m_State.hierarchyState);
             m_State.hierarchyData = new AnimationWindowHierarchyDataSource(m_TreeView, m_State);
+            m_HierarchyGUI = new AnimationWindowHierarchyGUI(m_TreeView, m_State);
             m_TreeView.Init(rect,
                 m_State.hierarchyData,
-                new AnimationWindowHierarchyGUI(m_TreeView, m_State),
+                m_HierarchyGUI,
                 null
             );
 

Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs

@@ -30,6 +30,9 @@ internal class AnimationWindowHierarchyGUI : TreeViewGUI
         private int[] m_HierarchyItemValueControlIDs;
         private int[] m_HierarchyItemButtonControlIDs;
 
+        private bool m_NeedsToReclaimFieldFocus;
+        private int m_FieldToReclaimFocus;
+
         private const float k_RowRightOffset = 10;
         private const float k_ValueFieldDragWidth = 15;
         private const float k_ValueFieldWidth = 80;
@@ -352,11 +355,12 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                             && Event.current.type == EventType.KeyDown
                             && (Event.current.character == '\n' || (int)Event.current.character == 3));
 
-                        //  Force back keyboard focus to float field editor when editing it.
-                        //  TreeView forces keyboard focus on itself at mouse down and we lose focus here.
+                        // Force back keyboard focus to float field editor when editing it since the TreeView forces keyboard focus on itself at mouse down.
+                        // The focus will be reclaimed after the TreeViewController.OnGUI call.
                         if (EditorGUI.s_RecycledEditor.controlID == id && Event.current.type == EventType.MouseDown && valueFieldRect.Contains(Event.current.mousePosition))
                         {
-                            GUIUtility.keyboardControl = id;
+                            m_NeedsToReclaimFieldFocus = true;
+                            m_FieldToReclaimFocus = id;
                         }
 
                         if (curve.isDiscreteCurve)
@@ -421,6 +425,15 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
             }
         }
 
+        internal void ReclaimPendingFieldFocus()
+        {
+            if (m_NeedsToReclaimFieldFocus)
+            {
+                GUIUtility.keyboardControl = m_FieldToReclaimFocus;
+                m_NeedsToReclaimFieldFocus = false;
+            }
+        }
+
         private bool DoTreeViewButton(int id, Rect position, GUIContent content, GUIStyle style)
         {
             Event evt = Event.current;

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -52,6 +52,7 @@
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Profiler")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.PS4")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.PS5")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.Switch")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Rendering")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.SceneVisibility")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.ScriptCompilation")]
@@ -147,7 +148,7 @@
 [assembly: InternalsVisibleTo("Unity.XR.Remoting.Editor")]
 [assembly: InternalsVisibleTo("UnityEngine.Common")]
 [assembly: InternalsVisibleTo("Unity.UI.Builder.Editor")]
-[assembly: InternalsVisibleTo("UnityEditor.UIElements.Tests.Tests")] // for UI Test Framework
+[assembly: InternalsVisibleTo("Unity.UI.TestFramework.Editor.Tests")] // for UI Test Framework
 [assembly: InternalsVisibleTo("UnityEditor.UIBuilderModule")]
 [assembly: InternalsVisibleTo("Unity.UI.Builder.EditorTests")]
 [assembly: InternalsVisibleTo("Unity.GraphViewTestUtilities.Editor")]
@@ -175,8 +176,8 @@
 
 [assembly: InternalsVisibleTo("Unity.Entities.Build")]
 
-[assembly: InternalsVisibleTo("Unity.Muse.Common.Bridge")]
 [assembly: InternalsVisibleTo("Unity.Muse.Chat.Bridge")]
+[assembly: InternalsVisibleTo("Unity.AI.Assistant.Bridge.Editor")]
 
 [assembly: InternalsVisibleTo("Unity.Multiplayer.Playmode.Editor.Bridge")]
 [assembly: InternalsVisibleTo("Unity.DedicatedServer.Editor.Bridge")]

Editor/Mono/AssetDatabase/AssetPreview.bindings.cs

@@ -22,16 +22,16 @@ public static Texture2D GetAssetPreview(Object asset)
             return null;
         }
 
-        internal static Texture2D GetAssetPreview(int instanceID)
+        internal static Texture2D GetAssetPreview(EntityId entityId)
         {
-            return GetAssetPreview(instanceID, kSharedClientID);
+            return GetAssetPreview(entityId, kSharedClientID);
         }
 
         [FreeFunction("AssetPreviewBindings::GetAssetPreview")]
-        internal static extern Texture2D GetAssetPreview(int instanceID, int clientID);
+        internal static extern Texture2D GetAssetPreview(EntityId entityId, int clientID);
 
         [FreeFunction("AssetPreviewBindings::HasAssetPreview")]
-        internal static extern bool HasAssetPreview(int instanceID, int clientID);
+        internal static extern bool HasAssetPreview(EntityId entityId, int clientID);
 
         internal static Texture2D GetAssetPreviewFromGUID(string guid)
         {
@@ -46,8 +46,13 @@ public static bool IsLoadingAssetPreview(int instanceID)
             return IsLoadingAssetPreview(instanceID, kSharedClientID);
         }
 
+        public static bool IsLoadingAssetPreview(EntityId entityId)
+        {
+            return IsLoadingAssetPreview(entityId, kSharedClientID);
+        }
+
         [FreeFunction("AssetPreviewBindings::IsLoadingAssetPreview")]
-        internal static extern bool IsLoadingAssetPreview(int instanceID, int clientID);
+        internal static extern bool IsLoadingAssetPreview(EntityId entityId, int clientID);
 
         public static bool IsLoadingAssetPreviews()
         {

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9ImporterModelEditor.cs

@@ -273,7 +273,7 @@ internal bool DoMaterialsHaveDifferentShader()
             {
                 prefabs[i] = assetTargets[i] as GameObject;
             }
-            
+
             List<SpeedTree9Importer> importerArray = new List<SpeedTree9Importer>();
             foreach (SpeedTree9Importer importer in importers)
             {
@@ -345,7 +345,7 @@ private void ShowLODGUI()
                             string[] heightsFormated = new string[heights.Length];
                             for (int i = 0; i < heights.Length; ++i)
                             {
-                                heightsFormated[i] = UnityString.Format("{0:0}%", heights[i] * 100);
+                                heightsFormated[i] = string.Format("{0:0}%", heights[i] * 100);
                             }
 
                             var menuText = String.Format("{0}: {1}",
@@ -640,7 +640,7 @@ private void DrawLODSettingCustomizationGUI(List<LODGroupGUI.LODInfo> lods, int
             }
             else
             {
-                // Toggle 
+                // Toggle
                 GUIContent customizationLabel = EditorGUIUtility.TrTextContent(String.Format("Customize {0} options", lods[lodIndex].LODName), "To override options for a certain LOD, check this box and select the LOD from the LOD slider above");
                 EditorGUILayout.PropertyField(lodSettingOverride, customizationLabel);
 

Editor/Mono/AssetStore/AssetStoreAsset.cs

@@ -681,7 +681,7 @@ private static string intToSizeString(int inValue)
             if (idx < 0)
                 return "<error>";
 
-            return UnityString.Format("{0:#.##} {1}", val, scale[idx]);
+            return string.Format("{0:#.##} {1}", val, scale[idx]);
         }
 
         public override bool HasPreviewGUI()

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

@@ -514,7 +514,7 @@ string GetEffectSlotName(AudioMixerEffectController effect, bool showLevel, Audi
         {
             if (m_ChangingWetMixIndex == m_IndexCounter && showLevel)
             {
-                return UnityString.Format("{0:F1} dB", effect.GetValueForMixLevel(m_Controller, snapshot));
+                return string.Format("{0:F1} dB", effect.GetValueForMixLevel(m_Controller, snapshot));
             }
 
             if (effect.IsSend() && effect.sendTarget != null)

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -182,10 +182,15 @@ public static VisualElement CreateModuleNotInstalledElement(GUID platformId)
                 return new IMGUIContainer(() =>
                 {
                     GUILayout.Label(EditorGUIUtility.TextContent(text), EditorStyles.wordWrappedLabel);
+                    
+                    EditorGUILayout.BeginHorizontal();
+                    // Add the space to align the button with text
+                    GUILayout.Space(6);
                     if (GUILayout.Button("Contact Sales", EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
                     {
                         Help.BrowseURL(url);
                     }
+                    EditorGUILayout.EndHorizontal();
                 });
             }
 

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -360,7 +360,7 @@ public PlatformInfo() {}
                     buildTarget = BuildTarget.Android,
                     nameAndLinkToShowUnderTitle = new List<NameAndLink>
                     {
-                        new NameAndLink{name = L10n.Tr("Unity Android Manual"),  linkUrl = "https://docs.unity3d.com/Manual/android.html"},
+                        new NameAndLink{name = L10n.Tr("Unity Android Manual"),  linkUrl = $"https://docs.unity3d.com/{Help.GetShortReleaseVersion()}/Documentation/Manual/android.html"},
                     },
                     iconName = "BuildSettings.Android",
                     flags = PlatformAttributes.IsWindowsBuildTarget | PlatformAttributes.IsWindowsArm64BuildTarget | PlatformAttributes.IsLinuxBuildTarget | PlatformAttributes.IsMacBuildTarget
@@ -512,9 +512,13 @@ public PlatformInfo() {}
                {
                     displayName = "Meta Quest",
                     downloadLinkName = "Android",
+                    description = L10n.Tr(
+                        "Take advantage of Unity's support for Meta Quest platforms and leverage Unity's extensive XR tools and frameworks. " +
+                        "This platform offers default project settings and configurations for a streamlined publishing process."
+                    ),
                     buildTarget = BuildTarget.Android,
                     iconName = "BuildSettings.Meta",
-                    requiredPackage = new string[]{L10n.Tr("com.unity.xr.meta-openxr") },
+                    requiredPackage = new string[]{L10n.Tr("com.unity.xr.openxr") },
                     flags = PlatformAttributes.IsWindowsBuildTarget | PlatformAttributes.IsWindowsArm64BuildTarget | PlatformAttributes.IsLinuxBuildTarget | PlatformAttributes.IsMacBuildTarget | PlatformAttributes.IsDerivedBuildTarget
                 }
             },
@@ -523,6 +527,8 @@ public PlatformInfo() {}
                 new PlatformInfo
                 {
                     displayName = "Android XR",
+                    downloadLinkName = "Android",
+                    description = L10n.Tr("Android XR provides a strong foundation for high-performance, immersive experiences. OpenXR conformance ensures support for widely used XR extensions, while cross-platform tools provide a familiar development experience. The Android XR build profile offers pre-configured settings tailored for Android XR development, making getting started fast and easy."),
                     buildTarget = BuildTarget.Android,
                     iconName = "BuildSettings.Android",
                     requiredPackage = new string[]{L10n.Tr("com.unity.xr.androidxr-openxr") },

Editor/Mono/CodeEditor/DefaultExternalCodeEditor.cs

@@ -8,13 +8,15 @@
 using Unity.CodeEditor;
 using UnityEditorInternal;
 using UnityEngine;
+using UnityEngine.Assertions;
+using NiceIO;
 
 namespace UnityEditor
 {
     internal class DefaultExternalCodeEditor : IExternalCodeEditor
     {
         static readonly GUIContent k_ResetArguments = EditorGUIUtility.TrTextContent("Reset argument");
-        static readonly string[] supportedExtensions = {"json", "asmdef", "log", "cs", "uxml", "uss", "shader", "compute", "cginc", "hlsl", "glslinc", "template", "raytrace" };
+        static readonly string[] supportedExtensions = { "json", "asmdef", "log", "cs", "uxml", "uss", "shader", "compute", "cginc", "hlsl", "glslinc", "template", "raytrace" };
         static bool IsOSX => Application.platform == RuntimePlatform.OSXEditor;
         static bool IsWindows => Application.platform == RuntimePlatform.WindowsEditor;
         static bool IsLinux => Application.platform == RuntimePlatform.LinuxEditor;
@@ -37,7 +39,7 @@ string Arguments
                 // So on OSX we change the key for per application for script editor args,
                 // to avoid reading the one from previous versions.
                 // The year 2021: Delete mac hack.
-                if (Application.platform == RuntimePlatform.OSXEditor)
+                if (IsOSX)
                 {
                     var oldMac = EditorPrefs.GetString("kScriptEditorArgs_" + Installation);
                     if (!string.IsNullOrEmpty(oldMac))
@@ -50,7 +52,7 @@ string Arguments
             }
             set
             {
-                if (Application.platform == RuntimePlatform.OSXEditor)
+                if (IsOSX)
                 {
                     EditorPrefs.SetString("kScriptEditorArgs_" + Installation, value);
                 }
@@ -134,37 +136,37 @@ public bool OpenProject(string path, int line, int column)
                 return false;
             }
 
-            string applicationPath = CodeEditor.CurrentEditorPath.Trim();
+            var applicationPath = CodeEditor.CurrentEditorPath.Trim();
+            var doesNotExistWarning =
+                $"External Code Editor application path does not exist ({applicationPath})! Please select a different application.";
 
-            if (!string.IsNullOrEmpty(applicationPath) && !File.Exists(applicationPath))
+            var npath = new NPath(applicationPath);
+            if (applicationPath == null || !npath.Exists())
             {
-                UnityEngine.Debug.LogWarning($"External Code Editor application path does not exist ({applicationPath})! Please select a different application");
+                UnityEngine.Debug.LogWarning(doesNotExistWarning);
+                return false;
             }
 
             if (applicationPath == CodeEditor.SystemDefaultPath)
             {
                 return InternalEditorUtility.OpenFileAtLineExternal(path, -1, -1);
             }
 
-            if (IsOSX)
-            {
-                return CodeEditor.OSOpenFile(applicationPath, CodeEditor.ParseArgument(Arguments, path, line, column));
-            }
-
             string fileName = "";
             string arguments = "";
-
-            if (IsLinux)
-            {
-                fileName = applicationPath;
-                arguments = CodeEditor.ParseArgument(Arguments, path, line, column);
-            }
-
-            if (IsWindows)
+            switch (Application.platform)
             {
-                fileName = "cmd.exe";
-                arguments = "/C \"" + CodeEditor.QuoteForProcessStart(applicationPath) +
-                    " " + CodeEditor.ParseArgument(Arguments, path, line, column) + "\"";
+                case RuntimePlatform.OSXEditor:
+                    return CodeEditor.OSOpenFile(applicationPath, CodeEditor.ParseArgument(Arguments, path, line, column));
+                case RuntimePlatform.LinuxEditor:
+                    fileName = applicationPath;
+                    arguments = CodeEditor.ParseArgument(Arguments, path, line, column);
+                    break;
+                case RuntimePlatform.WindowsEditor:
+                    fileName = "cmd.exe";
+                    arguments = "/C \"" + CodeEditor.QuoteForProcessStart(applicationPath) +
+                                " " + CodeEditor.ParseArgument(Arguments, path, line, column) + "\"";
+                    break;
             }
 
             var process = new Process