Unity 6000.2.0a10 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporter.bindings.cs

@@ -15,7 +15,7 @@
 namespace UnityEditor.U2D
 {
     // SpriteAtlas Importer lets you modify [[SpriteAtlas]]
-    [HelpURL("https://docs.unity3d.com/2023.2/Documentation/Manual/SpriteAtlasV2.html")]
+    [HelpURL("https://docs.unity3d.com/6000.2/Documentation/Manual/sprite/atlas/v2/sprite-atlas-v2.html")]
     [NativeHeader("Editor/Src/2D/SpriteAtlas/SpriteAtlasImporter.h")]
     public sealed partial class SpriteAtlasImporter : AssetImporter
     {

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -30,12 +30,13 @@ public enum NormalizationMode
         }
 
         //const int kToolbarHeight = 17;
-        const int kPresetsHeight = 46;
+        const int kPresetsHeight = 50;
 
         static CurveEditorWindow s_SharedCurveEditor;
 
         internal CurveEditor m_CurveEditor;
 
+        Vector2 m_PresetScrollPosition;
         AnimationCurve m_Curve;
         Color m_Color;
 
@@ -476,20 +477,38 @@ void OnGUI()
             m_CurveEditor.OnGUI();
 
             // Preset swatch area
-            GUI.Box(new Rect(0, position.height - kPresetsHeight, position.width, kPresetsHeight), "", ms_Styles.curveSwatchArea);
+            var presetRect = new Rect(0, position.height - kPresetsHeight, position.width, kPresetsHeight);
+            GUI.Box(presetRect, "", ms_Styles.curveSwatchArea);
+
             Color curveColor = m_Color;
             curveColor.a *= 0.6f;
-            const float margin = 45f;
             const float width = 40f;
             const float height = 25f;
-            float yPos = position.height - kPresetsHeight + (kPresetsHeight - height) * 0.5f;
+            const float spaceBetweenSwatches = 5f;
+            const float presetDropdownSize = 16f;
+            const float horizontalScrollbarHeight = 15f;
+            const float presetDropdownCenteringOffset = 2f;
+            float yPos = (kPresetsHeight - height) * 0.5f;
             InitCurvePresets();
             CurvePresetLibrary curveLibrary = m_CurvePresets.GetPresetLibraryEditor().GetCurrentLib();
             if (curveLibrary != null)
             {
-                for (int i = 0; i < curveLibrary.Count(); i++)
+                var numPresets = curveLibrary.Count();
+                var presetDropDownRect = new Rect(spaceBetweenSwatches, yPos + presetDropdownCenteringOffset, presetDropdownSize, presetDropdownSize);
+                Rect contentRect = new Rect(0, 0, numPresets * (width + spaceBetweenSwatches) + presetDropDownRect.xMax, presetRect.height - horizontalScrollbarHeight);
+                m_PresetScrollPosition = GUI.BeginScrollView(
+                    presetRect,               // Rectangle of the visible area
+                    m_PresetScrollPosition,   // Current scroll position
+                    contentRect,              // Rectangle containing all content
+                    false,                    // Always show horizontal scrollbar
+                    false                     // Always show vertical scrollbar
+                );
+
+                PresetDropDown(presetDropDownRect);
+
+                Rect swatchRect = new Rect(presetDropDownRect.xMax + spaceBetweenSwatches, yPos, width, height);
+                for (int i = 0; i < numPresets; i++)
                 {
-                    Rect swatchRect = new Rect(margin + (width + 5f) * i, yPos, width, height);
                     m_GUIContent.tooltip = curveLibrary.GetName(i);
                     if (GUI.Button(swatchRect, m_GUIContent, ms_Styles.curveSwatch))
                     {
@@ -503,14 +522,11 @@ void OnGUI()
                     if (Event.current.type == EventType.Repaint)
                         curveLibrary.Draw(swatchRect, i);
 
-                    if (swatchRect.xMax > position.width - 2 * margin)
-                        break;
+                    swatchRect.x += width + spaceBetweenSwatches;
                 }
+                GUI.EndScrollView();
             }
 
-            Rect presetDropDownButtonRect = new Rect(margin - 20f, yPos + 5f, 20, 20);
-            PresetDropDown(presetDropDownButtonRect);
-
             // For adding default preset curves
             //if (EditorGUI.DropdownButton(new Rect (position.width -26, yPos, 20, 20), GUIContent.none, FocusType.Passive, "OL Plus"))
             //  AddDefaultPresetsToCurrentLib ();

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -230,6 +230,7 @@ private void IconHasChanged()
                     }
                 }
             }
+            SyncToState();
 
             Repaint();
         }

Editor/Mono/Annotation/SceneRenderModeWindow.cs

@@ -146,7 +146,7 @@ static class Styles
 
         }
 
-        // Default CameraMode should be DrawCameraMode.GIContributorsReceivers
+        // UUM-96180: Default CameraMode should be DrawCameraMode.GIContributorsReceivers
         internal static SceneView.CameraMode defaultCameraMode
         {
             get

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -203,4 +203,5 @@
 // This should move with the AnimationWindow to a module at some point
 [assembly: InternalsVisibleTo("Unity.Modules.Animation.AnimationWindow.Tests.Editor")]
 [assembly: InternalsVisibleTo("Unity.Modules.Physics.Tests.Editor")]
+[assembly: InternalsVisibleTo("Unity.Tests.Shared")]
 

Editor/Mono/BuildPipeline.bindings.cs

@@ -703,6 +703,9 @@ public static string GetPlaybackEngineDirectory(BuildTargetGroup buildTargetGrou
         [FreeFunction(IsThreadSafe = true)]
         public static extern string GetPlaybackEngineDirectory(BuildTargetGroup buildTargetGroup, BuildTarget target, BuildOptions options, bool assertUnsupportedPlatforms);
 
+        [FreeFunction]
+        internal static extern bool IsServerBuildPlatformSupported(BuildTarget target);
+
         internal static string GetBuildToolsDirectory(BuildTarget target)
         {
             return Path.Combine(GetPlaybackEngineDirectory(target, BuildOptions.None, false), "Tools");

Editor/Mono/BuildPlayerWindowBuildMethods.cs

@@ -176,11 +176,15 @@ public static void BuildPlayer(BuildPlayerOptions options)
                 if (report != null
                 )
                 {
-                    var resultStr = String.Format("Build completed with a result of '{0}' in {1} seconds ({2} ms)",
+                    var resultStr = String.Format("Build completed with a result of '{0}' in {1} seconds ({2} ms) [{3} -> {4}, {5}]",
                         report.summary.result.ToString("g"),
                         Convert.ToInt32(report.summary.totalTime.TotalSeconds),
-                        Convert.ToInt32(report.summary.totalTime.TotalMilliseconds));
-
+                        Convert.ToInt32(report.summary.totalTime.TotalMilliseconds),
+                        report.summary.buildStartedAt.ToLocalTime(),
+                        report.summary.buildEndedAt.ToLocalTime(),
+                        FriendlyFormatBuildDuration(report.summary.totalTime)
+                        );
+                        
                     switch (report.summary.result)
                     {
                         case Build.Reporting.BuildResult.Unknown:
@@ -202,6 +206,23 @@ public static void BuildPlayer(BuildPlayerOptions options)
                 }
             }
 
+            static string FriendlyFormatBuildDuration(TimeSpan duration)
+            {
+                int totalHours = (int)duration.TotalHours;
+
+                if (totalHours > 0)
+                {
+                    return string.Format("{0}h {1:D2}m {2:D2}s", totalHours, duration.Minutes, duration.Seconds);
+                }
+
+                if (duration.Minutes > 0)
+                {
+                    return string.Format("{0}m {1:D2}s", duration.Minutes, duration.Seconds);
+                }
+
+                return string.Format("{0:D2}s", duration.Seconds);
+            }
+
             /// <summary>
             /// Default implementation for calculating build options before building the player.
             /// </summary>

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -66,12 +66,7 @@ internal static BuildProfile activeProfile
         {
             get
             {
-                // Active Build profile may be deleted from the project.
-                var activeProfile = EditorUserBuildSettings.activeBuildProfile;
-                if (activeProfile != null && activeProfile.CanBuildLocally())
-                    return activeProfile;
-
-                return null;
+                return EditorUserBuildSettings.activeBuildProfile;
             }
 
             set
@@ -275,6 +270,27 @@ internal static BuildProfile GetActiveOrClassicBuildProfile(
             return IsSharedProfile(platformGuid) ? instance.sharedProfile : instance.GetForClassicPlatform(platformGuid);
         }
 
+        /// <summary>
+        /// This method allows the native code to fetch the development setting from
+        /// build profiles without allocations.
+        /// </summary>
+        /// <remarks>
+        /// This is a workaround for certain allocation-sensitive graphics tests to pass.
+        /// We use return by ref to avoid the allocation that occurs when the return value
+        /// is boxed into a ScriptingObjectPtr.
+        /// </remarks>
+        [RequiredByNativeCode]
+        internal static void GetActiveOrClassicBuildProfileDevelopmentSetting(ref bool value)
+        {
+            var profile = IsSharedSettingEnabledInActiveProfile("development") ?
+                activeProfile : instance.sharedProfile;
+
+            if (profile == null || profile.platformBuildProfile == null)
+                value = false;
+            else
+                value = profile.platformBuildProfile.development;
+        }
+
         internal static bool TryGetActiveOrClassicPlatformSettingsBase<T>(
             BuildTarget target, StandaloneBuildSubtarget subTarget, out T result) where T : BuildProfilePlatformSettingsBase
         {

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -764,66 +764,17 @@ static void PreloadBuildPlatformInstalledData()
                 }
 
                 bool isInstalled = false;
-                if (platform.Value.HasFlag(PlatformAttributes.IsWindowsServerBuildTarget))
-                {
-                    var serverVariations = new[]
-                    {
-                        "win32_server_development",
-                        "win32_server_nondevelopment",
-                        "win64_server_development",
-                        "win64_server_nondevelopment",
-                        "win_arm64_server_development",
-                        "win_arm64_server_nondevelopment",
-                    };
-                    isInstalled = VariationPresent(serverVariations, playbackEngineDirectory);
-                }
-                else if (platform.Value.HasFlag(PlatformAttributes.IsLinuxServerBuildTarget))
-                {
-                    var serverVariations = new[]
-                    {
-                        "linux64_server_development",
-                        "linux64_server_nondevelopment",
-                    };
-                    isInstalled = VariationPresent(serverVariations, playbackEngineDirectory);
-                }
-                else if (platform.Value.HasFlag(PlatformAttributes.IsMacServerBuildTarget))
-                {
-                    var serverVariations = new[]
-                    {
-                        "macos_x64_server_development",
-                        "macos_x64_server_nondevelopment",
-                        "macos_arm64_server_development",
-                        "macos_arm64_server_nondevelopment",
-                        "macos_x64arm64_server_development",
-                        "macos_x64arm64_server_nondevelopment",
-                    };
-                    isInstalled = VariationPresent(serverVariations, playbackEngineDirectory);
-                }
+                if (platform.Value.HasFlag(PlatformAttributes.IsWindowsServerBuildTarget) ||
+                    platform.Value.HasFlag(PlatformAttributes.IsLinuxServerBuildTarget) ||
+                    platform.Value.HasFlag(PlatformAttributes.IsMacServerBuildTarget))
+                    isInstalled = BuildPipeline.IsServerBuildPlatformSupported(platform.Value.buildTarget);
                 else
                     isInstalled = true;
 
                 k_PlatformInstalledData.Add(platform.Key, isInstalled);
             }
         }
 
-        static bool VariationPresent(string[] variations, string playbackEngineDirectory)
-        {
-            if (string.IsNullOrEmpty(playbackEngineDirectory))
-                return false;
-
-            var scriptingBackends = new[] { "mono", "il2cpp", "coreclr" };
-            foreach (var variation in variations)
-            {
-                foreach (var backend in scriptingBackends)
-                {
-                    if (Directory.Exists(Paths.Combine(playbackEngineDirectory, "Variations", variation + "_" + backend)))
-                        return true;
-                }
-            }
-
-            return false;
-        }
-
         [System.Obsolete("BuildPlatformIsInstalled(BuildTarget) is obsolete. Use BuildPlatformIsInstalled(IBuildTarget) instead.", false)]
         public static bool BuildPlatformIsInstalled(BuildTarget platform) => BuildPlatformIsInstalled(GetGUIDFromBuildTarget(platform));
 

Editor/Mono/EditorGraphicsSettings.bindings.cs

@@ -9,6 +9,7 @@
 using UnityEditor.Rendering.Settings;
 using UnityEngine.Bindings;
 using UnityEngine.Rendering;
+using UnityEngine.Scripting;
 using Object = UnityEngine.Object;
 
 namespace UnityEditor.Rendering
@@ -19,7 +20,7 @@ public sealed partial class EditorGraphicsSettings
     {
         [NativeName("SetTierSettings")] extern internal static void SetTierSettingsImpl(BuildTargetGroup target, GraphicsTier tier, TierSettings settings);
 
-        extern public   static TierSettings GetTierSettings(BuildTargetGroup target, GraphicsTier tier);
+        extern public static TierSettings GetTierSettings(BuildTargetGroup target, GraphicsTier tier);
         public static TierSettings GetTierSettings(NamedBuildTarget target, GraphicsTier tier) => GetTierSettings(target.ToBuildTargetGroup(), tier);
 
         extern internal static TierSettings GetCurrentTierSettings();
@@ -34,7 +35,7 @@ public sealed partial class EditorGraphicsSettings
         extern internal static void RegisterUndo();
 
         extern private static AlbedoSwatchInfo[] GetAlbedoSwatches();
-        extern private static void               SetAlbedoSwatches(AlbedoSwatchInfo[] swatches);
+        extern private static void SetAlbedoSwatches(AlbedoSwatchInfo[] swatches);
 
         public static AlbedoSwatchInfo[] albedoSwatches
         {
@@ -218,5 +219,13 @@ public static bool TryGetRenderPipelineSettingsFromInterfaceForPipeline<TSetting
 
             return settings != null;
         }
+
+        [RequiredByNativeCode]
+        internal static bool IsGlobalSettingsContaining(UnityEngine.Object renderPipelineGlobalSettings, object renderPipelineGraphicsSettings)
+        {
+            var settings = renderPipelineGraphicsSettings as IRenderPipelineGraphicsSettings;
+            var globalSettings = renderPipelineGlobalSettings as RenderPipelineGlobalSettings;
+            return globalSettings.ContainsReference(settings);
+        }
     }
 }