Unity 2023.3.0a18 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/SceneFXWindow.cs

@@ -22,7 +22,7 @@ private class Styles
 
         public override Vector2 GetWindowSize()
         {
-            var windowHeight = 2f * kFrameWidth + EditorGUI.kSingleLineHeight * 6;
+            var windowHeight = 2f * kFrameWidth + EditorGUI.kSingleLineHeight * 7;
             if (UnityEngine.VFX.VFXManager.activateVFX)
             {
                 windowHeight += EditorGUI.kSingleLineHeight;

Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

@@ -22,6 +22,7 @@ public struct SpriteImportData
         private SpriteAlignment m_Alignment;
         private Vector2 m_Pivot;
         private Vector4 m_Border;
+        private string m_CustomData;
         private float m_TessellationDetail;
         private string m_SpriteID;
         private List<Vector2[]> m_Outline;
@@ -31,6 +32,7 @@ public struct SpriteImportData
         public SpriteAlignment alignment { get { return m_Alignment; } set { m_Alignment = value; } }
         public Vector2 pivot { get { return m_Pivot; } set { m_Pivot = value; } }
         public Vector4 border { get { return m_Border; } set { m_Border = value; } }
+        internal string customData { get { return m_CustomData; } set { m_CustomData = value; } }
         public List<Vector2[]> outline { get { return m_Outline; } set { m_Outline = value; } }
         public float tessellationDetail {get { return m_TessellationDetail; } set { m_TessellationDetail = value; } }
         public string spriteID {get { return m_SpriteID; } set { m_SpriteID = value; } }

Editor/Mono/AssetPipeline/TextureImporterTypes.bindings.cs

@@ -18,6 +18,7 @@ public struct SpriteMetaData
         public int alignment;
         public Vector2 pivot;
         public Vector4 border;
+        internal string customData;
     }
 
     // Note: MUST match memory layout of TextureImporterSettings in TextureImporter.h!

Editor/Mono/BuildPipeline/Android/AndroidPostGenerateGradleProject.cs

@@ -9,6 +9,7 @@
 
 namespace UnityEditor.Android
 {
+    [Obsolete("IPostGenerateGradleAndroidProject is deprecated. Use AndroidProjectFilesModifier instead.")]
     public interface IPostGenerateGradleAndroidProject : IOrderedCallback
     {
         [Obsolete("OnPostGenerateGradleAndroidProject is deprecated. Use AndroidProjectFilesModifier.OnModifyAndroidProjectFiles instead.")]

Editor/Mono/BuildPlayerWindow.cs

@@ -160,6 +160,8 @@ public static void ShowBuildPlayerWindow()
             GetWindow<BuildPlayerWindow>(false, "Build Settings");
         }
 
+        internal static bool WillDrawMultiplayerBuildOptions() => drawingMultiplayerBuildOptions != null;
+
         internal static void DrawMultiplayerBuildOption(NamedBuildTarget namedBuildTarget)
         {
             drawingMultiplayerBuildOptions?.Invoke(namedBuildTarget);

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -35,29 +35,42 @@ public static string GetClassicPlatformDisplayName(string moduleName, Standalone
             (moduleName, subtarget) switch
             {
                 ("OSXStandalone", StandaloneBuildSubtarget.Server) => "Mac Server",
-                ("WindowsStandalone",StandaloneBuildSubtarget.Server) => "Windows Server",
+                ("WindowsStandalone", StandaloneBuildSubtarget.Server) => "Windows Server",
                 ("LinuxStandalone", StandaloneBuildSubtarget.Server) => "Linux Server",
                 ("OSXStandalone", _) => "Mac",
                 ("WindowsStandalone", _) => "Windows",
                 ("LinuxStandalone", _) => "Linux",
-                ("UWP", _) => "Universal Windows Platform",
-                ("AppleTV", _) => "tvOS",
-                _ => moduleName
+                _ => GetModuleDisplayName(moduleName)
             };
 
         /// <summary>
-        /// Fetch editor platform icon texture.
+        /// Fetch default editor platform icon texture.
         /// </summary>
         public static Texture2D GetPlatformIcon(string moduleName, StandaloneBuildSubtarget subtarget)
         {
-            if (subtarget == StandaloneBuildSubtarget.Server)
-            {
-                return EditorGUIUtility.LoadIcon(string.Format(k_BuildSettingsPlatformIconFormat, "DedicatedServer"));
-            }
+            return GetBuildProfileIcon();
+            // TODO: Finalize Icon Design https://jira.unity3d.com/browse/PLAT-7379
+            //       return EditorGUIUtility.LoadIcon(GetPlatformIconId(moduleName, subtarget));
+        }
 
-            return EditorGUIUtility.LoadIcon(
-                s_DiscoveredTargetInfos.TryGetValue(moduleName, out var targetInfo)
-                ? targetInfo.iconName : "BuildSettings.Editor");
+        /// <summary>
+        /// Fetch small (16x16) editor platform icon texture.
+        /// </summary>
+        public static Texture2D GetPlatformIconSmall(string moduleName, StandaloneBuildSubtarget subtarget)
+        {
+            return GetBuildProfileIcon();
+            // TODO: Finalize Icon Design https://jira.unity3d.com/browse/PLAT-7379
+            //       return EditorGUIUtility.LoadIcon(GetPlatformIconId(moduleName, subtarget) + ".Small");
+        }
+
+        public static Texture2D GetBuildProfileIcon() => EditorGUIUtility.FindTexture(typeof(UnityEditor.Build.Profile.BuildProfile));
+
+        /// <summary>
+        /// Load internal warning icon
+        /// </summary>
+        public static Texture2D GetWarningIcon()
+        {
+            return EditorGUIUtility.LoadIcon("d_console.warnicon.sml");
         }
 
         /// <summary>
@@ -242,6 +255,15 @@ public static IBuildProfileExtension GetBuildProfileExtension(BuildTarget buildT
             return result;
         }
 
+        /// <summary>
+        /// Retrieve string of filename invalid characters
+        /// </summary>
+        /// <returns></returns>
+        public static string GetFilenameInvalidCharactersStr()
+        {
+            return EditorUtility.GetInvalidFilenameChars();
+        }
+
         internal static BuildTarget GetBuildTarget(string moduleName)
         {
             return s_DiscoveredTargetInfos[moduleName].buildTargetPlatformVal;
@@ -257,5 +279,31 @@ internal static BuildTarget GetBuildTarget(string moduleName)
             }
             return result;
         }
+
+        static string GetPlatformIconId(string moduleName, StandaloneBuildSubtarget subtarget)
+        {
+            if (subtarget == StandaloneBuildSubtarget.Server)
+            {
+                return string.Format(k_BuildSettingsPlatformIconFormat, "DedicatedServer");
+            }
+
+            if (s_DiscoveredTargetInfos.TryGetValue(moduleName, out var targetInfo))
+            {
+                return targetInfo.iconName;
+            }
+
+            return "BuildSettings.Editor";
+        }
+
+        /// <summary>
+        /// Module display name as defined on native side in "BuildTargetGroupName.h"
+        /// </summary>
+        static string GetModuleDisplayName(string moduleName)
+        {
+            if (!s_DiscoveredTargetInfos.TryGetValue(moduleName, out var gt))
+                return moduleName;
+
+            return BuildPipeline.GetBuildTargetGroupDisplayName(BuildPipeline.GetBuildTargetGroup(gt.buildTargetPlatformVal));
+        }
     }
 }

Editor/Mono/BuildProfile/BuildProfileRenameOverlay.cs

@@ -0,0 +1,75 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.IO;
+using UnityEngine;
+using UnityEngine.Bindings;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Build.Profile
+{
+    /// <summary>
+    /// Handles displaying tooltip view for renaming build profile
+    /// items with text field
+    /// </summary>
+    [VisibleToOtherModules("UnityEditor.BuildProfileModule")]
+    internal class BuildProfileRenameOverlay
+    {
+        static readonly string k_ErrorMessage = $"A file name can't contain any of the following characters:\t{BuildProfileModuleUtil.GetFilenameInvalidCharactersStr()}";
+
+        TextField m_TextField;
+        Rect? m_ErrorRect = null;
+
+        Rect errorRect
+        {
+            get
+            {
+                if (m_ErrorRect == null)
+                    m_ErrorRect = GUIUtility.GUIToScreenRect(m_TextField.worldBound);
+
+                return m_ErrorRect.Value;
+            }
+        }
+
+        public BuildProfileRenameOverlay(TextField textField)
+        {
+            m_TextField = textField;
+        }
+
+        public void OnNameChanged(string previousValue, string newValue)
+        {
+            // It's fine to call show and close tooltip on multiple frames
+            // since it only opens if not opened before. Also it only closes if
+            // not closed before
+            if (HasInvalidCharacterIndex(newValue))
+            {
+                // We can't use the text field's tooltip property since it's displayed
+                // automatically on hover. So we use the TooltipView to display the
+                // error message (same way as the RenameOverlay used for assets)
+                TooltipView.Show(k_ErrorMessage, errorRect);
+                m_TextField.SetValueWithoutNotify(previousValue);
+
+                // The cursor should be kept in place when adding an invalid character
+                var targetIndex = Mathf.Max(m_TextField.cursorIndex - 1, 0);
+                m_TextField.cursorIndex = targetIndex;
+                m_TextField.selectIndex = targetIndex;
+            }
+            else
+            {
+                TooltipView.ForceClose();
+            }
+        }
+
+        public void OnRenameEnd()
+        {
+            // Make sure tooltip is closed
+            TooltipView.ForceClose();
+        }
+
+        bool HasInvalidCharacterIndex(string value)
+        {
+            return value.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0;
+        }
+    }
+}

Editor/Mono/EditorGUI.RenderPipeline.cs

@@ -0,0 +1,69 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Diagnostics.CodeAnalysis;
+using UnityEngine;
+
+namespace UnityEditor
+{
+    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
+    public partial class EditorGUI
+    {
+        private static readonly int s_RenderingLayerMaskField = "s_RenderingLayerMaskField".GetHashCode();
+
+        // Make a field for rendering layer masks.
+        public static void RenderingLayerMaskField(Rect position, string label, SerializedProperty property)
+        {
+            RenderingLayerMaskFieldInternal(position, new GUIContent(label), property.uintValue, property, EditorStyles.layerMaskField);
+        }
+
+        public static void RenderingLayerMaskField(Rect position, GUIContent label, SerializedProperty property)
+        {
+            RenderingLayerMaskFieldInternal(position, label, property.uintValue, property, EditorStyles.layerMaskField);
+        }
+
+        public static RenderingLayerMask RenderingLayerMaskField(Rect position, string label, RenderingLayerMask layers)
+        {
+            return RenderingLayerMaskField(position, label, layers, EditorStyles.layerMaskField);
+        }
+
+        public static RenderingLayerMask RenderingLayerMaskField(Rect position, string label, RenderingLayerMask layers, GUIStyle style)
+        {
+            return RenderingLayerMaskField(position, new GUIContent(label), layers, style);
+        }
+
+        public static RenderingLayerMask RenderingLayerMaskField(Rect position, GUIContent label, RenderingLayerMask layers)
+        {
+            return RenderingLayerMaskField(position, label, layers, EditorStyles.layerMaskField);
+        }
+
+        public static RenderingLayerMask RenderingLayerMaskField(Rect position, GUIContent label, RenderingLayerMask layers, GUIStyle style)
+        {
+            return RenderingLayerMaskFieldInternal(position, label, layers, null, style);
+        }
+
+        static uint RenderingLayerMaskFieldInternal(Rect position, GUIContent label, uint layers, SerializedProperty property, GUIStyle style)
+        {
+            var id = GUIUtility.GetControlID(s_RenderingLayerMaskField, FocusType.Keyboard, position);
+            if (label != null)
+                position = PrefixLabel(position, id, label);
+
+            var names = RenderingLayerMask.GetDefinedRenderingLayerNames();
+            var values = RenderingLayerMask.GetDefinedRenderingLayerValues();
+
+            using var scope = new MixedValueScope();
+
+            BeginChangeCheck();
+            var newValue = MaskFieldGUI.DoMaskField(position, id, unchecked((int)layers), names, values, style);
+            if (EndChangeCheck() && property != null)
+            {
+                var bits = property.FindPropertyRelative("m_Bits");
+                Debug.Assert(bits != null, $"Property for RenderingLayerMask doesn't contain m_Bits. You should use new {nameof(RenderingLayerMask)} type with this drawer.");
+                bits.uintValue = (uint)newValue;
+            }
+
+            return unchecked((uint)newValue);
+        }
+    }
+}

Editor/Mono/EditorGUI.cs

@@ -63,7 +63,6 @@ public sealed partial class EditorGUI
         private static readonly int s_ColorHash = "s_ColorHash".GetHashCode();
         private static readonly int s_CurveHash = "s_CurveHash".GetHashCode();
         private static readonly int s_LayerMaskField = "s_LayerMaskField".GetHashCode();
-        private static readonly int s_RenderingLayerMaskField = "s_RenderingLayerMaskField".GetHashCode();
         private static readonly int s_MaskField = "s_MaskField".GetHashCode();
         private static readonly int s_EnumFlagsField = "s_EnumFlagsField".GetHashCode();
         private static readonly int s_GenericField = "s_GenericField".GetHashCode();
@@ -6606,7 +6605,7 @@ public static void HelpBox(Rect position, GUIContent content)
             if (content.image != null)
             {
                 var labelRect = position;
-                int iconSize = (int) (content.image.width / EditorGUIUtility.pixelsPerPoint) + EditorStyles.helpBox.padding.right;
+                int iconSize = (int) (content.image.width / EditorGUIUtility.pixelsPerPoint);
                 labelRect.x += iconSize;
                 labelRect.width -= iconSize;
 
@@ -7139,40 +7138,6 @@ internal static uint LayerMaskField(Rect position, UInt32 layers, SerializedProp
             return unchecked((uint)newValue);
         }
 
-        // Make a field for rendering layer masks.
-        internal static void RenderingLayerMaskField(Rect position, SerializedProperty property, GUIContent label, GUIStyle style)
-        {
-            RenderingLayerMaskField(position, property.uintValue, property, label, style);
-        }
-
-        internal static void RenderingLayerMaskField(Rect position, SerializedProperty property, GUIContent label)
-        {
-            RenderingLayerMaskField(position, property.uintValue, property, label, EditorStyles.layerMaskField);
-        }
-
-        internal static RenderingLayerMask RenderingLayerMaskField(Rect position, RenderingLayerMask layers, GUIContent label)
-        {
-            return RenderingLayerMaskField(position, layers, null, label, EditorStyles.layerMaskField);
-        }
-
-        internal static uint RenderingLayerMaskField(Rect position, UInt32 layers, SerializedProperty property, GUIContent label, GUIStyle style)
-        {
-            var id = GUIUtility.GetControlID(s_RenderingLayerMaskField, FocusType.Keyboard, position);
-            if (label != null)
-                position = PrefixLabel(position, id, label);
-
-            TagManager.GetDefinedRenderingLayers(out var renderingLayerNames, out var renderingLayerValues);
-
-            using var scope = new MixedValueScope();
-
-            BeginChangeCheck();
-            var newValue = MaskFieldGUI.DoMaskField(position, id, unchecked((int)layers), renderingLayerNames, renderingLayerValues, style);
-            if (EndChangeCheck() && property != null)
-                property.FindPropertyRelative("m_Bits").uintValue = (uint)newValue;
-
-            return unchecked((uint)newValue);
-        }
-
         // Helper function for helping with debugging the editor
         internal static void ShowRepaints()
         {
@@ -7716,6 +7681,23 @@ internal static bool DefaultPropertyField(Rect position, SerializedProperty prop
                         }
                         break;
                     }
+                    case SerializedPropertyType.RenderingLayerMask:
+                    {
+                        var names = RenderingLayerMask.GetDefinedRenderingLayerNames();
+                        var values = RenderingLayerMask.GetDefinedRenderingLayerValues();
+                        MaskFieldGUI.GetMaskButtonValue((int) property.uintValue, names, values, out var toggleLabel, out var toggleLabelMixed);
+                        if (label != null)
+                            position = PrefixLabel(position, label, EditorStyles.label);
+
+                        var toggleLabelContent = property.hasMultipleDifferentValues ? mixedValueContent : MaskFieldGUI.DoMixedLabel(toggleLabel, toggleLabelMixed, position, EditorStyles.layerMaskField);
+                        bool toggled = DropdownButton(position, toggleLabelContent, FocusType.Keyboard, EditorStyles.layerMaskField);
+                        if (toggled)
+                        {
+                            PopupWindowWithoutFocus.Show(position, new MaskFieldDropDown(property));
+                            GUIUtility.ExitGUI();
+                        }
+                        break;
+                    }
                     case SerializedPropertyType.Character:
                     {
                         char[] value = { (char)property.intValue };